test
user stories beta
user-story page
Merge branch 'master' of https://github.com/mohamed5amy/tms

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/header.js
	app/views/projects/_form.html.haml
	app/views/projects/_project.html.haml
	app/views/projects/index.html.haml
	app/views/projects/show.html.erb
	app/views/user_stories/_user_story.html.erb
	app/views/user_stories/update.js.erb