changed our index.html and app.js files
Merge branch 'master' of https://github.com/brandonadalesandro/ember.js-reddit

Conflicts:
	index.html
	js/app/app.js