prettyin up the calendar
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app

Conflicts:
	app/views/users/show.html.erb
updated expenses form from boat, groceries, gift