Initial commit
Added gitignore
Ammended gitignore
Removed uneccessary test data
Fixed merge
Added some changes to the site