d
Merge branch 'master' of https://github.com/kldcty/nova

Conflicts:
	src/main/java/nova/Main.java