9월4일 초기파일
no message
no message
no message
뇌_회전_js
heart_beat
no message
no message
팅케 스터디 준비
no message
Merge branch 'youngjae'
Revert "no message"

This reverts commit 37c6f7f4c9be0c31667e1e2d0eb4271b9cf914a8.
Merge branch 'master' of https://github.com/Jomalkeun/tinke-1

Conflicts:
	index.html
팅케 스터디 준비
Merge remote-tracking branch 'remotes/origin/pr/1'

Conflicts:
	css/all.css
	css/default.css
	css/doryun.css
	img/0.jpg
	img/1.jpg
	img/1.png
	img/10.png
	img/11.png
	img/12.png
	img/13.png
	img/2.jpg
	img/2.png
	img/3.jpg
	img/3.png
	img/4.jpg
	img/4.png
	img/5.jpg
	img/5.png
	img/6.png
	img/7.png
	img/8.png
	img/9.png
	img/android.png
	img/arrow_1.png
	img/arrow_2.png
	img/arrow_down.png
	img/arrow_next.png
	img/arrow_prev.png
	img/axis.png
	img/badge_0.png
	img/badge_1.png
	img/badge_2.png
	img/badge_3.png
	img/badge_4.png
	img/bg.png
	img/bg_footer.jpg
	img/bg_grid.jpg
	img/bg_grid_dark.jpg
	img/bg_indexes.png
	img/bg_intro.jpg
	img/bg_mobility.jpg
	img/bg_nav_bottom.jpg
	img/bg_nav_top.png
	img/bg_para.jpg
	img/bg_polka_2.jpg
	img/bg_splash.jpg
	img/black (1).png
	img/black (2).png
	img/black (3).png
	img/black.png
	img/blue (1).png
	img/blue (3).png
	img/blue.png
	img/body.png
	img/btn_buy.png
	img/btn_close.png
	img/btn_fb.png
	img/btn_more_blue.png
	img/btn_next_blue.png
	img/btn_next_white.png
	img/btn_shop.png
	img/btn_social_fb.png
	img/btn_social_pin.png
	img/btn_social_tw.png
	img/btn_social_yt.png
	img/ces.png
	img/circle.png
	img/cnn.png
	img/cnn_1.png
	img/content_left.png
	img/div.png
	img/fb.png
	img/forbes (1).png
	img/forbes.png
	img/gizmodo.png
	img/gizmodo_1.png
	img/glow_1.png
	img/glow_2.png
	img/graph_bottom.png
	img/graphic.png
	img/hand.png
	img/hand_1 (1).png
	img/hand_1.png
	img/hand_b.png
	img/head (1).png
	img/head.png
	img/heart (1).png
	img/heart (2).png
	img/heart.png
	img/heart_circle.png
	img/icon.png
	img/icon_batt.png
	img/icon_bk.png
	img/icon_bl.png
	img/icon_cart.png
	img/icon_cart_blue.png
	img/icon_clip.png
	img/icon_hr.png
	img/icon_hrv.png
	img/icon_oxy.png
	img/icon_pk.png
	img/icon_res.png
	img/icon_scn.png
	img/icon_wh.png
	img/ios.png
	img/iphone.png
	img/iphone_5.png
	img/iphone_glare.png
	img/knob_bg.png
	img/knob_top.png
	img/laptopmag.png
	img/light.png
	img/line (1).png
	img/line (2).png
	img/line (3).png
	img/line (4).png
	img/line.png
	img/lines.png
	img/logo_blue.png
	img/logo_dark.png
	img/logo_light.png
	img/meter.png
	img/nav_down.png
	img/number.png
	img/outline.png
	img/oxy.png
	img/pin.png
	img/pink (1).png
	img/pink (2).png
	img/pink (3).png
	img/pink.png
	img/pocket.png
	img/ppg.png
	img/ppg_bg.png
	img/product/screens/0.jpg
	img/product/screens/1.jpg
	img/product/screens/2.jpg
	img/product/screens/3.jpg
	img/product/screens/4.jpg
	img/product/screens/5.jpg
	img/pronun.png
	img/shadow (1).png
	img/shadow (2).png
	img/shadow (3).png
	img/shadow.png
	img/side_nav.png
	img/text (1).png
	img/text (2).png
	img/text (3).png
	img/text.png
	img/text_2.png
	img/thumb_b.png
	img/toggle_bg.png
	img/tw.png
	img/white (1).png
	img/white (2).png
	img/white (3).png
	img/white.png
	img/wired.png
	img/wired_1.png
	img/zen.png
	index.html
	js/EasePack.min.js
	js/TweenMax.min.js
	js/addthis_widget.js
	js/core151.js
	js/ean7lgg.js
	js/ga.js
	js/jquery.easing.1.3.js
	js/jquery.min.js
	js/mobiledetect.js
	js/modernizr-2.5.3.min.js
	js/plugins.js
	js/raphael-min.js
	js/social.js
	js/tour.js