useless save
fixed merge conflicts
 added angular js stuff
Merge branch 'master' of https://github.com/thegoodnetwork/thegoodnetwork