reverting Osam push
fig merge conflicts
Finally reverting master push
specifying exclude files
Revert "specifying exclude files"

This reverts commit c4177dd5c11776cb42aa5fe76a871c75d4879b9d.
testing .gitignore
testing .ignore
testing .ignore v1
deleting migration files and modifying the .gitignore
Merging master into local branch and resolving conflicts
fixed more conflicts
rmoved routes.rb~file