Commit before pull -Joel
Merge branch 'master' of https://github.com/pennja01/NorseSquare

Conflicts:
	Android/src/com/sp/norsesquare/froyo/SlideList.java
Merge branch 'master' of https://github.com/pennja01/NorseSquare
I'm confused with all this merging and these new classes. SHUCKS. -Joel
Merge branch 'master' of https://github.com/pennja01/NorseSquare