140823 / 용한 / 1936 / MY Backup
사진

Merge branch 'master' of https://github.com/LikeTalk/liketalk

Conflicts:
	.idea/workspace.xml
	apps/static/fonts/FontAwesome.otf
	apps/static/fonts/fontawesome-webfont.eot
	apps/static/fonts/fontawesome-webfont.svg
	apps/static/fonts/fontawesome-webfont.ttf
	apps/static/fonts/fontawesome-webfont.woff
	apps/static/js/jquery.isotope.min.js
	apps/static/js/jquery.singlePageNav.min.js
	apps/static/js/main.js
	apps/templates/base.html
	apps/templates/index.html
	apps/templates/index2.html
	apps/templates/navbar.html
	apps/views.py