Merge pull request #5 from emailsucks/master

Master
Merge pull request #6 from emailsucks/dev_mark

mailhook route
Merge pull request #7 from emailsucks/dev_mark

Dev mark
angular users controlers
deleted old front end JS files
Merge branch 'dev_main' of github.com:emailsucks/flybox_server into front-end-init
user log in mocked out
Merge pull request #8 from emailsucks/front-end-init

Front end init
user routes, not passing tests
merge devmain with user routes
Merge pull request #9 from emailsucks/koa_dev_branch

Looks good to me...moving right along!
Merge pull request #10 from emailsucks/dev_main

Merging dev main to get changes