initial commit
Updated gemfile
updated gemfile
updated gemfile
updated gemfile
whitespace update
whitespace fix
Cleaned up comments from Gemfile
Merge branch 'master' of https://github.com/sofatutor/wagn

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/account/_edit.erb