Updated formatting
Merge branch 'master' of http://github.com/zkendall/student-projects