Merge pull request #37 from Cynaria/merging

scrolling is boring
styling
Merge branch 'master' into merging