make client, added node_modules to gitignore
Merge github.com:hhroc/yellr

Conflicts:
	.gitignore
added *.orig to ignore
added make server to makefile
removed extra header
Merge pull request #15 from JHKennedy4/master

make client + gitignore stuff