fixed a condition and cleaned up the tabs, hate this stupid end things
Merge branch 'master' of https://github.com/williamwu2k12/rails-proj2