Updated Gitignore
Added Token to User function
Resolved Conflicts

Conflicts:
	.gitignore
	Gemfile.lock
Merge branch 'master' into ada_guests

Conflicts:
	.gitignore
	Gemfile.lock
Merge branch 'ada_guests'