Added basic CRUD for category and UserStory
Added routes for Category and UserStory
Added .swp and test directory to gitignore
Merge branch 'master' of github.com:mnzaki/se-hackathon

Conflicts:
	se-hackathon/.gitignore
	se-hackathon/config/routes.rb
A userstory lists its task in the show page
Added admin system using typus
Merge branch 'master' of https://github.com/m0hamed/se-hackathon
Add faker Gem and initial db:populate rake task.