Added a working feed view
Merge branch 'master' of https://github.com/JBWills/PaintDrip

Conflicts:
	app/app.iml
	gradle/wrapper/gradle-wrapper.properties
Added an icon to the feedactivity actionbar to start map activity