Started working on the controller for initial data.
Merge branch 'master' of https://github.com/jedininjaster/shortcutjunkie

Conflicts:
	app.js