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
Add nessary gems for versing and pareting
Merge branch 'add_categories' of github.com:Mab879/roomla into add_categories

Conflicts:
	Gemfile
	app/models/category.rb
	db/migrate/20131010230221_create_categories.rb
Add states for state mechine and made them pass.
Merge pull request #11 from Mab879/add_categories

Add categories