heroku ts
gitignore merge conflicts
fixed uploader bug
mandrill added