set up database addition of favorites and projects_users table
merging conflicts from upstream pull
added fix for create projects
added fix for create projects
made url regex more lax, now accepts non www/http urls
Merge branch 'master' of github.com:arjunbaokar/projectPortal into favoriteButton
messed around a bit. not really working yet, going to attempt from scratch
removed ProjectsUsers reference
no changes
Merge branch 'master' of github.com:calblueprint/projectPortal
mass assignment issue, but created join model and display fav projects
Merge branch 'master' of github.com:calblueprint/projectPortal
fixed adding favorites, but adds duplicates
removed duplicates issue, need to show project cards
Merge remote-tracking branch 'upstream/master'
project card now shows up on favorites
allowed unfavoriting of projects
changed fav/unfav to buttons, but need to place on project_card and prettify
resolving merge conflicts from favoriteButton -> master
cleaned up commented code