Merge pull request #1 from abrahamoshel/dev

inital setup from dev
trying heroku again
merge
rename resources to be applicable