Commit to merge with master
Added information to About page
Merge branch 'develop'