Merge branch 'master' of C:\Users\Nathan\Documents\Senior\SoftwareDesign\blubz2 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	res/layout/main_screen_layout.xml
	src/com/example/blubz/MainScreen.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Redirect user to mainscreen after blubbing