Merge pull request #64 from emailsucks/dev_mark

Dev mark
so much good sasssssss
so much good no ruby fuck yeah
merge?
Merge pull request #65 from emailsucks/front-end-init

Front end init
more deletes
Merge pull request #66 from emailsucks/front-end-init

more deletes
grunt build
grunt build heroku
grunt and bower
logo change
add client tests for box
order correct
Merge branch 'dev_main' of github.com:emailsucks/flybox_server into front-end-init
Merge pull request #67 from emailsucks/front-end-init

Front end init
Merge branch 'dev_main' of https://github.com/emailsucks/flybox_server into dev_mark
add client side box tests
delete build
Merge branch 'dev_main' of https://github.com/emailsucks/flybox_server into dev_box
mail connection close