Merge pull request #51 from emailsucks/dev_mark

Dev mark
stupid css
nothing here to see
angular edit buttons working
links on box work now, text fields are editable
Merge pull request #52 from emailsucks/dev_box

Dev box
fix socket updates
Merge pull request #53 from emailsucks/dev_box

fix socket updates
useless commit
?
hope this works
?
Merge pull request #54 from emailsucks/koa_dev_branch

Koa dev branch
conflict avereteded
Merge pull request #55 from emailsucks/front-end-init

Front end init
new heroku build