Windows "No source of timezone data could be found."-Error fix
Merge branch 'master' of https://github.com/RailsWeek2014/Rubylator

Conflicts:
	Gemfile.lock