my-expenses layout
Merge branch 'master' of https://github.com/mckenn/autoreport

Conflicts:
	js/application.js
Merge branch 'master' of https://github.com/mckenn/autoreport