Changed some stuff with assets
Merge branch 'master' of github.com:patrickf3139/bCal-Website
Merge branch 'master' of github.com:patrickf3139/bCal-Website
Fixed oauth redirecting to localhost
Merge branch 'master' of github.com:patrickf3139/bCal-Website