First commit, just managed to get everything to compile nicely for client
Merge branch 'master' of https://github.com/jsjessen/360_4lab