gemfile
Merge branch 'master' of github.com:FerneyHorde/yearbook

Conflicts:
	Gemfile.lock
Merge branch 'master' of github.com:FerneyHorde/yearbook
Merge branch 'master' of github.com:FerneyHorde/yearbook
Adding Tags to Images
Merge branch 'master' of github.com:FerneyHorde/yearbook
Fixes #2 Invite new user for Admin
Merge branch 'keith' into rob

Conflicts:
	db/schema.rb
Merge branch 'rob'