updated changelog
make documentation more consistent
finally push this patch to fix the lack of an end
Merge branch 'master' of github.com:mutantturkey/quikr
Merge branch 'master' of github.com:EESI/quikr