Modified the main application layout
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into project_skeleton
Salma commited untracked files
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into project_skeleton

Conflicts:
	arability/app/views/layouts/application.html.erb
Added vim .swp files to the gitignore
Salma finished story functionality
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C3_SalmaFG_S07
Salma commited
Salma commited
Salma commited
Salma added mig
Salma added mig categories_projects
Merge pull request #121 from MGhanem/C3_SalmaFG_Mig

dropped table projects_categories and created categories_projects
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C3_SalmaFG_S07
Salma commited projects_controller
Salma merged conflicts
Salma commited files
Salma added a table update
Salma added doc
Salma committed merged files with Tamer