Merge remote-tracking branch 'upstream/master' into stewperry

Conflicts:
	src/main.c
	src/score.c
Fixed some typos, aligned code to current master branch.
Merge remote-tracking branch 'airween/stewperry' into int