static pages and vip model
add missing .DS_Store
lalala
for god's sake
for gods sake...
whygit add .git add .
Merge branch 'static-pages'
merge!!!
Conflicts:
	.DS_Store