Merge branch 'master' of https://github.com/coleunites/GameJam2017

# Conflicts:
#	Assets/PreFabs/section2/sec2Ring3.prefab
#	Assets/Scenes/TestBed.unity

Signed-off-by: Cole Rudniski <coleunites@shaw.ca>