Add the ice_cube gem
Merge weekdays and weekends into one column in the database
Use an array with two items to represent hours
Start using ice cube in Location#open?
Fix some errors where Location attributes that were removed were still used
Fix some rubocop issues
Use IceCube explicitly instead of including it in Location
Install factory_girl_rails
Use Factory Girl to replace the Location fixtures with a factory
Merge branch 'factory-girl' into ice-cube-and-factory-girl

Conflicts:
	app/models/location.rb
	test/fixtures/locations.yml
Merge branch 'master' into ice-cube-and-factory-girl
Don't require factory_girl_rails in the Gemfile
Merge branch 'ice-cube' of https://github.com/thenickperson/open-at-rit into ice-cube

Conflicts:
	Gemfile.lock
	app/models/location.rb
	test/fixtures/locations.yml