Merge branch 'develop'
Merge branch 'develop'
Added about page
Added about page
Merge branch 'develop'

Conflicts:
	index.html
Fixed weird merge issue
Merge branch 'master' into develop