add image
fix title
lang zh
add story
replace png with jpg to speed up loading
Mobile friendly

update col-xs-6 to col-md-6
Merge pull request #10 from mark86092/master

Mobile friendly
small fix
	modified:   index.html
Merge branch 'master' of https://github.com/phys-tw/camp2015

Conflicts:
	index.html
Merge branch 'video_background' of https://github.com/phys-tw/camp2015 into video_background
Merge branch 'video_background' of https://github.com/phys-tw/camp2015 into video_background

Conflicts:
	index.html
temp save