Second Commit 19 - 10 - 2014

This is Jordan's final upload