derpd a line
Merge branch 'master' of github.com:ThisIsTaylor/PracticeRepository into 2

Conflicts:
	thisIsAFile.txt
Merge pull request #3 from ThisIsTaylor/2

derpd a line