Modified the main application layout
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into project_skeleton
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
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into project_skeleton
added .orig files to git ignore
Merge pull request #140 from MGhanem/project_skeleton

Project skeleton