stash
.DS_Store nonsense
default.css
Merge branch 'melissa'
changes to make things work on the server
Merge branch 'master' of https://github.com/mpangilinan/project-webarch
missed changes and whatnot
Merge branch 'master' of github.com:mpangilinan/project-webarch
Merge branch 'master' of github.com:mpangilinan/project-webarch into melissa
main page works
some new features implemented
Merge branch 'master' of github.com:mpangilinan/project-webarch
Merge branch 'master' of github.com:mpangilinan/project-webarch into melissa
added javascript to cards and data
stashed DS_Store nonsenes
stats work nowish
adjusted stats cards so they're on the same page
changed home.html