fix merge conflicts! NO MORE LOCKED DOORS!!!
Merge branch 'master' of github.com:MarcGarreau/clonewars_uncubed
fix merge conflicts in app.rb