dont know why but git told me to commit for workspace.xml
Merge branch 'dev_home' into dev_lab

Conflicts:
	.idea/workspace.xml
Merge branch 'dev_home' into dev_lab

Conflicts:
	.idea/workspace.xml
Implementing rArea detail and list pages
making disaster detail pages
Fixed a bug in counter