update as of 9:43
Merge branch 'master' of github.com:Sirenity/Spannanagrams

merging branches