Merge branch 'master' of https://github.com/sharonrh/Gamma

Conflicts:
	Project/gen/com/example/gamma/R.java
Merge branch 'master' of https://github.com/sharonrh/Gamma