forms forms forms
Merge branch 'master' of github.com:jcamins/easycfo

Conflicts:
	css/main.scss
	index.html