Merge branch 'master' of H:\Web-Programming\Python\Project\Prexter with conflicts.
Merge remote-tracking branch 'origin/master'
V6