Le'me just commit my changes
Merge branch 'master' of https://github.com/nyacg/quickgive

Conflicts:
	Gemfile.lock
SOme commit
Merge branch 'master' of https://github.com/nyacg/quickgive