doing a commit to pull new info - zack
Merge branch 'master' of https://github.com/pennja01/NorseSquare
basic commit, working on database connection - zack
Merge branch 'master' of https://github.com/pennja01/NorseSquare

Conflicts:
	Android/.classpath
	Android/res/layout/control_panel.xml
	Android/src/com/sp/norsesquare/froyo/OverlayList.java
Did some work in DatabaseTask.java able to connect to receive info. -Zack