Merge branch 'Woojin'

Conflicts:
	css/list.css
	css/main.css
	css/mystory.css
	css/player.css
	css/search.css
	css/styles.css
	css/vote.css
	html/main.html
	html/mystory.html
	html/player.html
	html/search.html
	html/signup.html
	html/vote.html
	img/best.png
	img/nav_search.png
	img/new.png
	img/recent.png
	img/story.png
	img/vote.png
	js/main.js
	js/player.js