Little flair
Merge branch 'master' of github.com:ATLauncher/ATLauncher

Conflicts:
	src/main/java/com/atlauncher/App.java
	src/main/java/com/atlauncher/gui/card/InstanceCard.java
	src/main/java/com/atlauncher/gui/card/ModCard.java