Merge branch 'master' of https://github.com/axelhildingson/groupName1

Conflicts:
	gen/android/support/v7/appcompat/R.java
	gen/com/example/groupname/R.java