to server
Merge branch 'master' of https://github.com/GmanJames/Cubbard
Merge branch 'master' of https://github.com/GmanJames/Cubbard
Merge branch 'master' of https://github.com/GmanJames/Cubbard
added appropriate fields
sync
Merge branch 'master' of https://github.com/GmanJames/Cubbard

Conflicts:
	css/style.css
	index.php
	js/forms.js