finished homework
Merge branch 'master' of https://github.com/SUNY-Albany-CCI/INF-362-Web-Development-Sandbox-Spring-2013