added server
naming cleanup
package
heroku Procfile
resolve merge conflict from pull