Jonathan's updates
Jonathan's updates

Conflicts:
	css/main.css
Merge pull request #8 from torijule/Forms

Jonathan's updates