bump
bergson, hegel
bump
engels
jhering, marx
nietzsche
mill, comte
finalise
Merge branch 'development' into navbar

Conflicts:
	2012/09/index.html
	2012/10/index.html
	2012/11/index.html
	2012/12/index.html
	2013/01/index.html
	2013/02/index.html
	2013/03/index.html
	2013/04/index.html
	2013/05/index.html
	2013/06/index.html
	2013/07/index.html
	2013/09/index.html
	2013/10/index.html
	404.html
	about-this-blog/index.html
	credits/index.html
	decoding-of-aristoteles-metaphysik/index.html
	decoding-of-aristoteles-politik/index.html
	decoding-of-augustinus-confessiones/index.html
	decoding-of-bentham-principles-of-morals-and-legislation/index.html
	decoding-of-bergson-donnees-immediates/index.html
	decoding-of-comte-discours-esprit-positif/index.html
	decoding-of-daigaku-chuyou/index.html
	decoding-of-descartes-methode/index.html
	decoding-of-descartes-passions/index.html
	decoding-of-dewey-experience-and-education/index.html
	decoding-of-engels-feuerbach/index.html
	decoding-of-engels-utopie/index.html
	decoding-of-hegel-philosophie-rechts-1/index.html
	decoding-of-hegel-philosophie-rechts-2/index.html
	decoding-of-hobbes-leviathan/index.html
	decoding-of-hume-enquiry-human-understanding/index.html
	decoding-of-isvarakrsna-samkhyakarika/index.html
	decoding-of-james-pragmatism/index.html
	decoding-of-jhering-kampf/index.html
	decoding-of-kant-ewigen-frieden/index.html
	decoding-of-kant-kritik-praktischen-vernunft/index.html
	decoding-of-kant-kritik-reinen-vernunft/index.html
	decoding-of-locke-human-understanding/index.html
	decoding-of-locke-two-treatises/index.html
	decoding-of-machiavelli-principe/index.html
	decoding-of-madhava-arhatadarsana/index.html
	decoding-of-marx-judenfrage/index.html
	decoding-of-mill-on-liberty/index.html
	decoding-of-mill-utilitarianism/index.html
	decoding-of-nietzsche-genealogie/index.html
	decoding-of-nietzsche-tragodie/index.html
	decoding-of-nietzsche-wille-zur-macht-1/index.html
	decoding-of-nietzsche-wille-zur-macht-2/index.html
	decoding-of-owen-new-view-of-society/index.html
	decoding-of-patanjali-yoga/index.html
	decoding-of-platon-menon/index.html
	decoding-of-platon-phaedrus/index.html
	decoding-of-platon-phaidon/index.html
	decoding-of-platon-symposion/index.html
	decoding-of-ramanuja-vedarthasamgraha/index.html
	decoding-of-rousseau-contrat-social/index.html
	decoding-of-rousseau-inegalite/index.html
	decoding-of-sankara-brahmasutra/index.html
	decoding-of-smith-wealth-of-nations/index.html
	decoding-of-upanishads/index.html
	decoding-of-vatsyayaniyam-nyayabhasyam/index.html
	decoding-of-weber-geist/index.html
	decoding-of-weber-politik-als-beruf/index.html
	decoding-of-weber-staatssoziologie/index.html
	decoding-of-weber-wissenschaft-als-beruf/index.html
	fastphilosophy-descartes-published/index.html
	fastphilosophy-indian-philosophy-published/index.html
	fastphilosophy-kant-published/index.html
	fastphilosophy-locke-published/index.html
	fastphilosophy-mill-published/index.html
	fastphilosophy-nietzsche-published/index.html
	fastphilosophy-platon-published/index.html
	fastphilosophy-rousseau-published/index.html
	fastphilosophy/descartes/index.html
	fastphilosophy/index.html
	fastphilosophy/indian-philosophy/index.html
	fastphilosophy/kant/index.html
	fastphilosophy/locke/index.html
	fastphilosophy/mill/index.html
	fastphilosophy/nietzsche/index.html
	fastphilosophy/platon/index.html
	fastphilosophy/rousseau/index.html
	index.html
	map/index.html
	search.html
	site-moved-and-redesigned/index.html
	tag/aristoteles/index.html
	tag/augustinus/index.html
	tag/bentham/index.html
	tag/bergson/index.html
	tag/chinese-thought/index.html
	tag/comte/index.html
	tag/descartes/index.html
	tag/dewey/index.html
	tag/economics/index.html
	tag/educational-philosophy/index.html
	tag/engels/index.html
	tag/epistemology/index.html
	tag/ethics/index.html
	tag/feuerbach/index.html
	tag/hegel/index.html
	tag/hobbes/index.html
	tag/hume/index.html
	tag/indian-philosophy/index.html
	tag/info/index.html
	tag/james/index.html
	tag/jhering/index.html
	tag/kant/index.html
	tag/law-philosophy/index.html
	tag/locke/index.html
	tag/machiavelli/index.html
	tag/marx/index.html
	tag/mill/index.html
	tag/modern-philosophy/index.html
	tag/nietzsche/index.html
	tag/owen/index.html
	tag/platon/index.html
	tag/politics/index.html
	tag/pragmatism/index.html
	tag/qanda/index.html
	tag/rousseau/index.html
	tag/smith/index.html
	tag/social-contract/index.html
	tag/socialism/index.html
	tag/sociology/index.html
	tag/utilitarianism/index.html
	tag/weber/index.html
	what-is-categorical-imperative/index.html
	what-is-methodic-doubt-for/index.html
	what-is-relationship-between-captalism-and-ethics-protestantism/index.html
corrected
Merge pull request #239 from luixxiul/navbar

Navbar