Fixed all merges, commented out WIP code

Checked every merge code, picked nessecary code and deleted rest.
WIP code such as inventory are commented out.
Can compile battletest.
Items are given placeholder stats,