Added user id
Merge branch 'master' of github.com:jasonklein/wdi-project-2

Conflicts:
	stacksy/db/migrate/20140516155704_create_users.rb