Modified GemFile
Merge branch 'master' of https://github.com/lvalencia/waisfh.com

Conflicts:
	Gemfile.lock
Fixed Gemfile.lock merge error