logout
Merge branch 'master' of https://github.com/UTASoftwareEngineering2014/HealthNow

Conflicts:
	res/drawable-mdpi/Thumbs.db
	src/com/application/healthnow/ExpandableListAdapter.java
	src/com/application/healthnow/MainActivity.java
fixes