Delete redundant file
Edit gemfile
Merge branch 'develop' of https://github.com/ilovearsenal93/tms_2 into develop