Merge branch 'master' of C:\Users\Quis\AndroidStudioProjects\AggiesLand-Android with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/lbbw/AggiesLand/aggiesland/appfinal/TabBarActivity.java
updating occuring