Merge pull request #13 from pstephen43/master

Sync up before 2/4 session
all of tuesdays changes, s3 works
work from wednesday
all of Fridays work !WORKING!

could be compitition ready
added the lift raise back into S1
FINAL !WORKING!
all the changes from the turniment
performing non-trivial merge