change gemfile.lock
- Add user avatar to profile
- Add row to view
- Add thumbmails to gallery for habtm w checkbox
- fix merge conflicts

Merge branch 'master' of github.com:tuducks/elkeen

Conflicts:
	app/views/layouts/_navigation_links.html.erb
	app/views/users/show.html.erb