Added back and option buttons
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/home.html
	app/views/home.js