adjusting the version to 1.1
Merge branch 'master' of https://github.com/wheelinghscomputerclub/wcc_android_app

Conflicts:
	gen/org/d214/whs/wcc/portal/R.java
remove more files that should not be in the repo
add the gitignore so that the generated files are ignored