fix
Merge branch 'develop'
new style
Merge branch 'develop'
fix
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	miniakio/static/style/style.css
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	miniakio/static/style/style.css
add python3 support
Merge branch 'develop'
add time formt
add new home style
Merge branch 'develop'

Conflicts:
	miniakio/static/style/style.css
nav style
new nav style
done:new nav style
Merge branch 'develop'