Screw Gemfile.lock

Linux != Mac != Windows. Thanks OBAMA.
Merge branch 'master' of github.com:brianto/civic-app-petition-prototype

Conflicts:
	Gemfile.lock