First Commit
Merge branch 'master' of https://github.com/Kotkar/The-Resistance
Pull from master