.gitignore
Update .gitignore for server dir of future merge
Merge branch 'master' into kevr
added build infrastructure and changed src directory tree