Finished linear solution
Merge branch 'master' of github.com:amccann/Rubix