Merge branch 'sprint1' of https://github.com/sabertaylor/lameover into sprint1