Put in the data
Merge branch 'master' of https://github.com/marcfalk/oreo

Conflicts:
	css/style.css
	index.html
	js/app/init.js
	scss/style.scss
Merge branch 'master' of https://github.com/marcfalk/oreo