testing the new branch
testing the new branch
added:
 - tabs for the home page (Global and Friends)
 - swipe pages (horizontal)
 - customized slide menu
 - color
added:
 - tabs for the home page (Global and Friends)
 - swipe pages (horizontal)
 - customized slide menu
 - color
added:
 - tabs for the home page (Global and Friends)
 - swipe pages (horizontal)
 - customized slide menu
 - color
Merge commit '72d4fab28b87c81c20361c93e56ba2b51639581e'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/gebruiker/pickler/Pickler.java
Merge remote-tracking branch 'origin/samuel'