Create User model with devise
Implement API authentication via token
Update gitignore to exclude tags and secret
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/routes.rb