Updated file structure and began work on server
Merge branch 'master' of https://github.com/sticknor/CMTechnologyApp