Added user API endpoints and some item endpoints.
Updated navbar conflict.
Added modal and user service.
Rick Roll Function
Merge adam's changes
Added dashboard and fixed modal variables not appearing.
Fixed pop up window
Merge from Adam Branch, fixed Modal