Merge branch 'Jake'
Test
Redo
Added status updates
Deleted test file
Merge remote-tracking branch 'origin/Wesley' into Jake
Merge branch 'Jake'
Merge branch 'master' of https://github.com/jaruesink/SMART