modified .hgignore
Merge branch 'master' of github.com:concurrency-cs-luc-edu/shapes-android-java-eclipse