Added unique constraints for user
Add javascript and JQuery to every page
missing semicolons
merge conflict
fixing merge conflict
Add menu
Merge branch 'devRemi'
added project_model calls to populate welcome page project cards
added dummy get_popular/recent/local functions for welcome page project cards
added popular/recent/local project cards
Nothing
Merge branch 'devD' merging welcome page files
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