Merge branch 'fix/travis-build' of https://github.com/cgcgbcbc/CloudComputing into cgcgbcbc-fix/travis-build

Conflicts:
	db/migrate/20131115110927_create_articles.rb
	db/migrate/20131115111340_create_categories.rb
	db/schema.rb
	lib/tasks/travis-ci.rake