Commit before merge
Merge branch 'master' of https://github.com/Trrnts/Trrnts into develop
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into develop
Write about page
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into develop
Merge branch 'makeAboutPage' into develop

Conflicts:
	client/dist/main.min.js
	client/dist/main.min.js.map