Works V2
Merge branch 'master' of git://github.com/yingted/EDTALKS
Working with proper directions
Merge branch 'master' of github.com:JGulbronson/EDTALKS

Conflicts:
	EDTALKS/bin/AndroidManifest.xml
	EDTALKS/bin/classes/uwaterloo/enghack/edtalks/CampusNavigator.class
	EDTALKS/bin/classes/uwaterloo/enghack/edtalks/HomeScreen.class
	EDTALKS/bin/classes/uwaterloo/enghack/edtalks/R$drawable.class
	EDTALKS/bin/classes/uwaterloo/enghack/edtalks/R$id.class
	EDTALKS/bin/classes/uwaterloo/enghack/edtalks/R$layout.class
	EDTALKS/bin/classes/uwaterloo/enghack/edtalks/R$menu.class
	EDTALKS/bin/classes/uwaterloo/enghack/edtalks/R$string.class
	EDTALKS/bin/classes/uwaterloo/enghack/edtalks/R$style.class
	EDTALKS/gen/uwaterloo/enghack/edtalks/R.java
	EDTALKS/res/drawable-hdpi/king_07.png
	EDTALKS/src/uwaterloo/enghack/edtalks/HomeScreen.java
add map layout
Merge branch 'master' of github.com:JGulbronson/EDTALKS
add lotr
Merge branch 'master' of github.com:JGulbronson/EDTALKS
works