Allowed for university id for easier API calls and removed welcome to simple app
Merge remote-tracking branch 'origin/sqlite'

Conflicts:
	app/controllers/users_controller.rb