touch
Merge branch 'master' of github.com:nl79/is218proj3
Updated autoloading controllers and html generation