N's changes
Merge branch 'master' of https://github.com/HackAccount/git_testing