placeholders working
Merge branch 'master' of https://github.com/jennywen/j3

Conflicts:
	app/index.html