changed getPath signature
directions
Updated Direction.toString() to be more readable
clean up
Merge branch 'master' of github.com:yingted/EDTALKS
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
Merge branch 'master' of github.com:JGulbronson/EDTALKS
Merge branch 'master' of github.com:JGulbronson/EDTALKS
works
fix bug
styling
more stuff
works
add apk
Merge pull request #2 from yingted/master

sync the repos