Added my branch to master

Lots of styling and more files added.