Test changes
edits
Merge branch 'master' of github.com:Kimomaru/C