FUn times
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/pages/home.html.erb
Merge branch 'master' of https://github.com/nyacg/quickgive