Added spork/guard, run us "bundle exec guard"
Modified Gemfile so it doesn't throw exeptions on Linux. Slavik, uncomment gems for Windows and comment out Linux ones, and then add Gemfile to .gitignore
Merge branch 'master' of https://github.com/erp-lsf/ira_site
Finally, finished integration of spork/guard, run as 'bundle exec guard'. Also uncomment gems for windows and comment linux ones, and then add Gemfile to .gitignore
Conflicts:
	Gemfile
	Gemfile.lock
	spec/spec_helper.rb