Newest Changes
Merge github.com:berjoyner/Payback

Conflicts:
	app/views/newuser.html