afjjfashkfhfjshf
Enter the dragon

Merge branch 'master' of github.com:vgtomahawk/towersofbrahma2810

Conflicts:
	a.out
	supernova.cpp
x