Add nessary gems for versing and pareting
Merge branch 'add_categories' of github.com:Mab879/roomla into add_categories

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/category.rb
	db/migrate/20131010230221_create_categories.rb