first commit
Merge branch 'master' of https://github.com/kimikun/blog

Conflicts:
	README.md
update
 Changes to be committed:
	new file:   DB/db.txt
	new file:   app.php
	new file:   config.php
	new file:   controllers/chronologie.php
	new file:   controllers/contact.php
	new file:   controllers/error404.php
	new file:   controllers/liens.php
	new file:   functions.php
	new file:   lib/rb.phar
	new file:   lib/rb.php
	new file:   models/category.php
	new file:   models/category.php~
	new file:   models/media.php
	new file:   models/post.php
	new file:   models/tag.php
	new file:   resources/README
	new file:   resources/ajax-loader.gif
	new file:   resources/css/categories.css
	new file:   resources/css/login.css
	new file:   resources/css/main.css
	new file:   resources/css/normalize.css
	new file:   resources/css/normalize.min.css
	new file:   resources/css/post.css
	new file:   resources/dropbox/dropbox.css
	new file:   resources/dropbox/dropbox.deleteItems.js
	new file:   resources/dropbox/dropbox.js
	new file:   resources/dropbox/img/background_tile_1.jpg
	new file:   resources/dropbox/img/background_tile_2.jpg
	new file:   resources/dropbox/img/background_tile_3.jpg
	new file:   resources/dropbox/img/blue_line.jpg
	new file:   resources/dropbox/img/delete.png
	new file:   resources/dropbox/img/done.png
	new file:   resources/font/alegreya-regular-webfont.eot
	new file:   resources/font/alegreya-regular-webfont.svg
	new file:   resources/font/alegreya-regular-webfont.ttf
	new file:   resources/font/stylesheet.css
	new file:   resources/jquery.plugins/html5lightbox.js
new file:   resources/jquery.plugins/jquery.autogrow.js
	new file:   resources/jquery.plugins/jquery.filedrop.js
	new file:   resources/jquery.plugins/jquery.infinite-scroll-helper.js
	new file:   resources/jquery.plugins/jquery.lazyload.js
	new file:   resources/jquery.plugins/jquery.sortable.css
	new file:   resources/jquery.plugins/jquery.sortable.js
	new file:   resources/jquery.plugins/jquery.tagInput.css
	new file:   resources/jquery.plugins/jquery.tagInput.js
	new file:   resources/jquery.plugins/jquery.timers.js
	new file:   resources/jquery.plugins/skins/default/close.png
	new file:   resources/jquery.plugins/skins/default/loading.gif
	new file:   resources/jquery.plugins/skins/default/next.png
	new file:   resources/jquery.plugins/skins/default/pause.png
	new file:   resources/jquery.plugins/skins/default/play.png
	new file:   resources/jquery.plugins/skins/default/playvideo_64.png
	new file:   resources/jquery.plugins/skins/default/prev.png
	new file:   resources/js/admin.js
	new file:   resources/js/categories.js
	new file:   resources/js/galleries.js
	new file:   resources/js/index.js
	new file:   resources/js/login.js
	new file:   resources/js/logout.js
	new file:   resources/js/post.js
	new file:   resources/js/settings.js
	new file:   resources/loader/loader.css
	new file:   resources/loader/loader.js
	new file:   resources/pixel.gif
	new file:   resources/wysiwym/buttons.dark.png
	new file:   resources/wysiwym/buttons.light.png
	new file:   resources/wysiwym/showdown.js
	new file:   resources/wysiwym/toMarkdown.js
	new file:   resources/wysiwym/wysiwym.css
	new file:   resources/wysiwym/wysiwym.js
new file:   uploads/jpg_bassist_futurist__by_dadoundy-d54jtq6crop70703.0t.jpg
	new file:   uploads/jpg_billy__by_dadoundy-d555hfpcrop70703.0t.jpg
	new file:   uploads/jpg_crapule__by_dadoundy-d54f1nxcrop70702.0019t.jpg
	new file:   uploads/jpg_demon_hunter__by_dadoundy-d54jtgccrop70702.0030t.jpg
	new file:   uploads/jpg_night_chapel__by_dadoundy-d3ba5xocrop70703.0t.jpg
	new file:   views/category_manage.php
	new file:   views/disqus_comments.php
	new file:   views/disqus_load.php
	new file:   views/dropbox.php
	new file:   views/head.php
	new file:   views/html.php
	new file:   views/list.php
	new file:   views/login.php
	new file:   views/post_add.php
	new file:   views/scripts.php
	new file:   views/settings.php

	modified:   README.md

 Untracked files:
	README.md~