fix layout, remove bootstap.min1
Merge branch 'master' of https://github.com/minhy/happy-water