create page for unique username error
fix conflicts in user_control.rb
Merge branch 'master' of https://github.com/fabianuribe/flashit