Initial commit
Merging with Nick's repository setup
Struggled with folders a bit.