the real good template
Merge branch 'patrick' into dev