don't break basic functionality in your testing branch
Merge branch 'development' of github.com:cmyr/anagramer into development
Merge branch 'development' of github.com:cmyr/anagramer into development
faster hash loading, hopefully
fixed a bug in hash extraction
merging future into dev
adding back untracked stuff
Merge branch 'development'
fixing conflicts
Merge branch 'development'
merging master