Changed some small layout things with the tab bar
Merged
Merge branch 'master' of https://github.com/JBWills/PaintDrip

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/edu/cmsc434/paintdrip/paintdripprototype/Feed/FeedActivity.java
	app/src/main/java/edu/cmsc434/paintdrip/paintdripprototype/MapsActivity.java