Removing tilde files
Moved the tilde gitignore to the top of the repo
Merge branch 'master' of https://github.com/carolinemarcks/blockytalky-ror