remove .idea/ and log/ files from git
commit pull changes after merge
commit after pull and merge
update jobs, events, and blogs forms
Merge branch 'master' of https://github.com/brentan/energyfolks_server