no message
Merge branch 'master' of https://github.com/pwhsueh/sturdy

Conflicts:
	assets/templates/css/about.css