updated proposal

updated proposal
forcing me to sync these

syncing student web
Merge branch 'master' of https://github.com/cisbjmaclean/CIS2232_Intercession20132014