Update README.md
tes
Merge branch 'master' into test

Conflicts:
	Assets/Scripts/Reference.cs
Merge branch 'master' of https://github.com/mkchu243/magnaCarta
I think I accidently did this in my master branch
oops nothing changed here
Merge branch 'master' into dchan_dev
yay, moved my changes from master to my branch -.-
Yay, progress in health calculation.  TestEnemy is buggy
I commented out the TestEnemy. Muahahaha
Update README.md
Merge branch 'dchan_dev' into mkchu_dev
damage over time, refactoring