Merge branch 'dev'
Merge branch 'dev'
swapped out the favicon. Fixed a bug with loading pages when multiple pages start with the same phrase
Added Changelog
Merge branch 'master' into dev