SwipeViews UI Change
merging with upstream changes
swipe stuff
hjklh
I did it yayyyyy
Merge branch 'master' of https://github.com/mtabor150/CampusCreatures into swipeviewsUI

Conflicts:
	res/layout/activity_main.xml
Merge branch 'swipeviewsUI'

Conflicts:
	res/layout/activity_main.xml
	res/layout/fragment_creature_atlas.xml
	res/layout/fragment_home.xml
	res/layout/fragment_map.xml
	src/campuscreatures/main/CreatureAtlasFragment.java
	src/campuscreatures/main/HomeFragment.java
	src/campuscreatures/main/MainActivity.java
	src/campuscreatures/main/MainPagerAdapter.java
	src/campuscreatures/main/MapFragment.java
I hate eclipse