Rearranged structure in preparation for Jade HTML
Merge branch 'master' of git:itsapi-2.0

Conflicts:
	index.js