Commit a working copy without markers
Merge branch 'master' of https://github.com/sheillashojaie/battlehack-app