Updated Gitignore
Added Token to User function
Resolved Conflicts

Conflicts:
	.gitignore
	Gemfile.lock