Precompiled assets to publish to Heroku
added a new controller
Merge branch 'filling-in-layout'

Conflicts:
	public/assets/application-2ddd696091755a4c6664f08a59d9f879.js.gz
	public/assets/application-5e185b3e61bfa99d72cbbfc3878ec069.css.gz
	public/assets/application.css.gz
	public/assets/application.js.gz
Merge branch 'master' of https://github.com/aarjmand/sample_app

Conflicts:
	public/assets/application-2ddd696091755a4c6664f08a59d9f879.js.gz
	public/assets/application-5e185b3e61bfa99d72cbbfc3878ec069.css.gz
	public/assets/application.css.gz
	public/assets/application.js.gz
Precompiled assets