synch
Merge branch 'master' of github.com:SalamanderMike/gifter
synch from Superman
Merge branch 'master' of github.com:SalamanderMike/gifter
synch with Superman
Conflicts:
	app/views/gifter_templates/index.html.erb
bundle update