Add all DS_Store to gitignore
Remove node_modules
Add all DS_Store to gitignore
Remove node_modules
Merge branch 'master' of https://github.com/JoshLankford/field-sun-server
Add all DS_Store to gitignore
Remove node_modules
remove all DS_Store
Merge branch 'master' of https://github.com/JoshLankford/field-sun-server
Add all DS_Store to gitignore
Remove node_modules
remove all DS_Store
Add travis config
Merge branch 'master' of https://github.com/JoshLankford/field-sun-server

Conflicts:
	.travis.yml
Merge pull request #15 from JoshLankford/master

Remove node_modules and DS_Store files