updated staged layout
Merge branch 'master' of https://github.com/DonovanJames/Diptych

Conflicts:
	public/app/templates/diptych.html