Merge branch 'master' into dev
Merge branch 'master' into posts
moved data to s3 for faster loading
Merge branch 's3' into dev
Merge branch 'dev' into posts
icosahedron post 1
Merge branch 'posts' into dev
final corrections
Merge branch 'dev'