make logo and nav smaller
Merge branch 'master' of github.com:dormbase/Simmons-Website
Merge remote-tracking branch 'origin/master'
Fixed calendar issue after change from simmons-tech@mit.edu to simmons.hall.tech@gmail.com
Merge pull request #23 from lrsjohnson/master

Fixed reservation calendar embed issue arising from ownership change
Merge branch 'master' of https://github.com/simmons-tech/Simmons-Website
Fixed MS-reported XSS bug on sds login page
Fixed MS-reported XSS bug on sds login page
Merge pull request #25 from lrsjohnson/master

Fixed MSVR-reported XSS error on simmons sds login page
Merge branch 'master' of https://github.com/simmons-tech/Simmons-Website
Updated some descriptions / times to CPW schedule
Merge pull request #26 from lrsjohnson/master

Updated Simmons CPW 2013 Schedule
Merge branch 'master' of https://github.com/simmons-tech/Simmons-Website
Adds Liscence...
Steve Hall's Updates to Residential Scholar Pages
Merge branch 'master' of https://github.com/simmons-tech/Simmons-Website
Merge https://github.com/allenpark/Simmons-Website into allenpark-master

Conflicts:
	calendar.html
Updated embed links for new i3 and anthem
Merge pull request #28 from lrsjohnson/master

Updated YouTube links to include new i3 video.
Merge branch 'master' of https://github.com/simmons-tech/Simmons-Website into allenpark-master