first commit
Working again
Fixed develop
Merge branch 'refs/heads/hotfix' into develop

Conflicts:
	gen/monterey_housing/ideasofmarch2014team6/R.java