pre-pull commit, nothing really changed except some line breaks for ie
Merge branch 'master' of https://github.com/patrickbjohnson/project-kitty

Conflicts:
	app/index.html
	bower.json
oh snap son is ie9 working? cause i think ie9 might be working.