Gitignore
Merge branch 'wes' of https://github.com/SeaMonster-Studios/angular-uc into wes

Conflicts:
	.gitignore