First server commit
Merge branch 'master' of github.com:SideCar6/aegis