changed port for heroku
added back port 3001
Merge branch 'master' into aluxian
Merge branch 'master' into aluxian