Merge pull request #388 from SethTisue/two-2016-confs

2016 events: add flatMap(Oslo) and ScalaSphere

Author: SethTisue

events/_posts/2016-02-11-scalasphere.md

@@ -0,0 +1,9 @@
+---
+title: ScalaSphere
+logo: /resources/img/scalasphere.png
+location: Kraków
+description: "Let’s immerse ourselves into Scala DevTools"
+start: 11 February 2016
+end: 12 February 2016
+link-out: http://scalasphere.org
+---

events/_posts/2016-05-02-flatmap-oslo.md

@@ -0,0 +1,9 @@
+---
+title: flatMap(Oslo)
+logo: /resources/img/flatmap-oslo-new.png
+location: Oslo
+description: "flatMap(Oslo) is a functional programming conference with focus on Scala and the Java Virtual Machine"
+start: 2 May 2016
+end: 3 May 2016
+link-out: http://2016.flatmap.no/
+---