init setup
resolve merging conflicts
added procfile
fixed the foreman error by removing the $RACK_ENV var
Merge pull request #9 from DesignOpen/procfile

Procfile
merged latest master