init
built skeleton
skeleton done
homepage done
fixed conflict
fix conflict