Putting my page in
Merge branch 'master' of https://github.com/drbobdugan/Capstone2014
Merged Nick updates