working on modal
modal
Merge branch 'develop' of codeforge.cs.missouri.edu:swe-j into develop
Merge branch 'develop' of codeforge.cs.missouri.edu:swe-j into develop
Changed the order of the statements.
no message
Merge branch 'develop' of codeforge.cs.missouri.edu:swe-j into develop
no message
changed modal buttons
conflict
added profile page
Merge branch 'develop' into vandiggelenj_sprint1
Added risk to superuser group (permissions problems).
Merge branch 'ahnera_sprint1' into develop
Merge branch 'develop' of codeforge.cs.missouri.edu:swe-j into vandiggelenj_sprint1
Couldn't get modal to work, so switched to link for the registration page.
Commented registration render partial out.
Merge branch 'develop' into ahnera_sprint1
URL bug fixed.
added logout for users