Added unique constraints for user
Add javascript and JQuery to every page
Add menu
Merge branch 'devRemi'
Merge branch 'devD' merging welcome page files
Giving user_model insert enrty, update entry, find_entry
Datatbase tool
Merge branch 'master' of github.com:gattazr/Folio
This is project template, update page_header, & sql
Nothing
Merge branch 'master' of github.com:gattazr/Folio

Conflicts:
	application/controllers/welcome.php
Merge branch 'devJ'

Conflicts:
	application/views/templates/page_header.php
Add basic authentication test
Merge branch 'devRemi'

Conflicts:
	application/models/user_model.php
Merge branch 'dev_croftp2'

Conflicts:
	application/models/user_model.php
Merge branch 'master' of github.com:gattazr/Folio

Conflicts:
	application/models/user_model.php
added get_collaborators()
replaced html with project_info_card()
added project controller
created project_info_card() and user_info_card()