gem updates
fixed users
Merge branch 'ryan'
remove animated icons
Merge branch 'master' into ryan
Merge branch 'ryan'
Add wrapper to pages
Merge branch 'ryan'
Merge branch 'master' of github.com:mugu87/myApp

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/users_controller.rb