clean commit with seperate app and server programs
Merge branch 'master' of github.com:PeterMitrano/HereIAm
cleanup and merge