Re-updated HTML and controllers
Merge branch 'master' of https://github.com/alecng94/Technical-Projects