Fixed formatting
No need for a .gitignore yet
Merge branch 'master' of github.com:Nycroth/srs