Added profile avatar with paperclip gem
Merge branch 'master' of github.com:rickbrunstedt/meditag

Conflicts:
	app/assets/javascripts/application.js
Merge branch 'master' of github.com:rickbrunstedt/meditag