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

Conflicts:
	Gemfile.lock