Got modules working.
Merge branch 'master' of /home/tynach/Documents/Dry

Conflicts:
	templates/default.htmt