edit from ragnarokII
edit from ragnarokII
merge
Merge branch 'master' of https://github.com/cbates-/BlackIceTest

Conflicts:
	readme.txt

What's goin' on?