stash
.DS_Store nonsense
Merge branch 'master' of github.com:mpangilinan/project-webarch
Merge branch 'master' of github.com:mpangilinan/project-webarch into melissa
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