Reconnecting project
Merge branch 'master' of https://github.com/meet-projects/crowdalertsystem-y2-2014

Conflicts:
	contactstyle.css
	contactuscas.html
	index.html