Merge pull request #13 from thequbit/master

moving things around to get ready for python server stuff
updated grunt file for new folder structure
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
test build, make sure things are still working. checkin before develop branch checkout
added make server to makefile
removed extra header
latest things. pushing to help debug cordova
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
Merge pull request #17 from aztec8/master

the latest things to debug cordova installs
untrack app
Merge pull request #18 from thequbit/master

first take of server app using pyramid
makes ios
Merge pull request #19 from JHKennedy4/master

Run `make ios` to build ios
migrated to pcreate templates for pyramid (much better than by hand ...)