untrack gen
...
.
Merge branch 'master' of https://github.com/przedwojow/AndroidAPP

Conflicts:
	gen/pl/zeromskiego/androidapp/R.java
	res/menu/main.xml
	res/values/styles.xml