updated gitignore
Awesome
Merge branch 'master' of github.com:Q42/seeingspaces
Merge branch 'master' of github.com:Q42/seeingspaces
Removed ffmpeg-server