commit
Merge branch 'master' of https://github.com/RARyan/NIATestRepo

Conflicts:
	My First Git.txt