cancel button fixed
Teacher sidebar created
create new resource bug fixed
deleted teacher layout/added autocomplete for photos
resolved conflict
conflict resolved
rollbacked routes to original stage
conflict resolved
Profile layout
resource page design
cleaned up session controller
Merge branch 'development' of github.com:bashantad/Industry-project into development
conflict resolved
added feature to add option
transaction block commented
added user profile page
conflict resolved
Profile page routing fixed
added validation to ensure a correct option is chose
Merge branch 'development' of github.com:bashantad/Industry-project into development