added a little bit of functionality and merging
Merge branch 'devt-Chapa' of github.com:packrat386/Website into devt

Conflicts:
	parser.js

Mergin
holy shit, I hate that bug
added some error checking
first draft of the genOut function
fixing conflicts for merging
fixing merge conflicts
removed parser (pls work)