Modify setup instructions, add diagonal method to square
Merge branch 'master' of https://github.com/wdi-sf-march-2014/notes