Merge branch 'master' into test
Cleaning up, adding styles
Finishing up
Merge branch 'test'