Just basic structures :D
test
Merge branch 'upstream'

Conflicts:
	main.c
Merge branch 'master' of github.com:Sayybot/Sands
jajaja