Update Help.java
about
scoreboard
scoreboard
Merge branch 'master' of https://github.com/Oceane/A-Hole-in-the-Universe
ignore something
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Revert "Database Simplified"

This reverts commit 4116e0b871a9d51c15dd7c3815f83fbb5abd0e6d.
Revert "scoreboard"

This reverts commit 492885e25e872abac8a65986f77afdf6c8056ca5.
Revert "scoreboard"

This reverts commit 61d8b33af0646ecbd64ac4db2966f45c0f019adb.
Revert "ignore something"

This reverts commit 0fbea8e13f0367a7ae60f01a6aa17ce073a595d3.

Conflicts:
	.gitignore
	Icons/Thumbs.db