Added Flash Messages for success and error
Merge branch 'develop' of https://github.com/Team-Delta/GitMyCurriculum into lincoln-flash-messages

Conflicts:
	app/views/search/user_search.html.erb
	config/routes.rb
closes #57, created more database objects
closes #57
Flash Messages done needs formating
Update README.rdoc
closes #57
closes #57
just trying to get travis-ci working
cleaning depandancies to speed up travis
adding os back
adding extra rails cops
converted tabs to spaces, removed rugged from ci build
possible speed up for travis ci
fixing jquery and solr
fixing style errors, re-adding turbolinks
fixing style errors
Merge pull request #66 from ChristianMurphy/task-931

cleaning depandancies to speed up travis
Updating for travis ci
Finished flash message formating