UPDATED Tuesday notes
Merge branch 'master' of github.com:ewb-ucf/webDevelopmentSeries_summer14 into mergeUpstream