Merge pull request #1 from mjhea0/dev

Procfile and doctype change
Merge branch 'master' into dev
modularizing
working on rest changeover