Added adapter in mainlistviewactivty; commented out location in mainlistviewactivity adapter
Merge branch 'Costa'

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/MainListViewActivity.java