Connected client framework together
Merge branch 'master' of https://github.com/aweinstock314/HackRPI_2014_project