half through user authentication
authentication added with one minor error
user authorization and authentication done
took out some unneeded symbol in show page
conflicts resolved
merge to master conflict resolved
Merge branch 'angela'
deleted the extra migrations