Merge origin/master

Conflicts:
	.gitignore
	src/bottomPanel.java
	src/mainPanel.java
Merge origin/master