jscs more
Merge branch 'dev_main' of https://github.com/emailsucks/flybox_server into koa_dev_branch
Merge pull request #45 from emailsucks/dev_main

main to get even on mark
Merge pull request #46 from emailsucks/front-end-init

Front end init
Merge pull request #47 from emailsucks/dev_main

get even what?
grunt build fresh
update box controller
Merge branch 'dev_main' of https://github.com/emailsucks/flybox_server into dev_box

Conflicts:
	build/CSS/box.css
	build/CSS/box.css.map
working on box gets
Merge branch 'dev_box' of https://github.com/emailsucks/flybox_server into koa_dev_branch
add author name
logo to email
cleaned and functional angular box get route
Merge pull request #48 from emailsucks/koa_dev_branch

Koa dev branch
socket on server.js
logo add
add logo to email
logo resize in email
resize logo
flyboxmessage