changes to make things work on the server
Merge branch 'master' of https://github.com/mpangilinan/project-webarch
missed changes and whatnot