still workin
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/pl/byd/wsg/promand/project5/add/AddScreenActivity.java
	app/src/main/res/layout/add_screen_test.xml