inital commit
merged with upstream
saving everything before hooking up to heroku