Fix hogan import for real
Merge branch 'master' of github.com:jasonTheNorris/jamstagram
Merge branch 'master' of github.com:jasonTheNorris/jamstagram

Conflicts:
	public/app.html