node mods that need to be removed
add git ignore
Merge branch 'develop' of https://github.com/burrows-codefest/mercurious-server into develop

Conflicts:
	.gitignore
Removed node mods
Reformatted git ignore
added oauth

added to package.json
Merge pull request #1 from burrows-codefest/feature-setup_angular

Feature setup angular
Removed nodes
Added some text
Merge branch 'develop' into feature-setup_angular