.gitignore should not have gemfile.lock, because that's crazy. make fix
Merge branch 'events_are_generated_from_schedule' of https://github.com/purple-martins-2013/Sports-Spike into events_are_generated_from_schedule
Pulling down changes which were previously pushed to make some changes