Merge pull request #14 from aztec8/master

updated grunt file for new folder structure
make client, added node_modules to gitignore
Merge github.com:hhroc/yellr

Conflicts:
	.gitignore
added *.orig to ignore
Update README.md
added make server to makefile
removed extra header
Merge pull request #16 from JHKennedy4/patch-1

Update README.md
Merge pull request #15 from JHKennedy4/master

make client + gitignore stuff
Merge https://github.com/hhroc/yellr