Commiting the project files. Hope that I didn't put any binaries
Merge branch 'master' of https://github.com/Team3167/2014TestBed