add admin attribute to user
Merge branch 'master' of github.com:patbl/skillshare

Conflicts:
	db/migrate/20131016094053_create_users.rb