File updates
Merge pull request #3 from drcauley/master

Merging code with server