z
Merge branch 'master' of github.com:Jacke/billsproject

Conflicts:
	app/views/histories/index.html.haml
Merge branch 'master' of github.com:Jacke/billsproject
Steve jobs <3