First commit
Added article app and gallery app

Changes to be committed:
	modified:   articles/admin.py
	modified:   articles/models.py
	new file:   articles/templates/articles/article.html
	new file:   articles/templates/articles/index.html
	modified:   articles/views.py
	modified:   gallery/admin.py
	modified:   gallery/models.py
	new file:   gallery/templates/gallery/index.html
	new file:   gallery/templates/gallery/single_photo.html
	modified:   gallery/views.py
	modified:   ideapracownia/settings.py
	modified:   ideapracownia/urls.py
	new file:   media/photos/2014/10/28/14.jpg
	new file:   media/photos/2014/10/29/0ea1b19.jpg
	new file:   media/photos/2014/10/29/1558519_10153175547399546_6569370942699155555_n.jpg
	new file:   media/photos/2014/10/29/clicker.jpg
	new file:   media/photos/2014/10/29/happy.jpg
	new file:   media/photos/2014/10/29/portal_2_bsod_by_shantella-d4sat1d.png
	new file:   media/photos/2014/10/29/tabletfactory.jpg
	new file:   media/photos/2014/11/01/untitled.png
	new file:   media/photos/2014/11/01/wellcomtestimg.jpg
	new file:   media/photos/2014/11/01/wellcomtestimg_6.jpg
	new file:   pages/admin.py
	modified:   pages/models.py
	new file:   pages/templates/pages/index.html
	new file:   pages/templates/pages/page_not_found.html
	modified:   pages/views.py
	new file:   static/css/base.css
	new file:   static/img/child.jpg
	new file:   static/img/logo.png
	new file:   static/js/editor.js
	new file:   static/js/pl.js
	new file:   static/js/tinymce/langs/readme.md
	new file:   static/js/tinymce/license.txt
	new file:   static/js/tinymce/plugins/advlist/plugin.min.js
	new file:   static/js/tinymce/plugins/anchor/plugin.min.js
	new file:   static/js/tinymce/plugins/autolink/plugin.min.js
	new file:   static/js/tinymce/plugins/autoresize/plugin.min.js
	new file:   static/js/tinymce/plugins/autosave/plugin.min.js
	new file:   static/js/tinymce/plugins/bbcode/plugin.min.js
	new file:   static/js/tinymce/plugins/charmap/plugin.min.js
	new file:   static/js/tinymce/plugins/code/plugin.min.js
	new file:   static/js/tinymce/plugins/colorpicker/plugin.min.js
	new file:   static/js/tinymce/plugins/contextmenu/plugin.min.js
	new file:   static/js/tinymce/plugins/directionality/plugin.min.js
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-cool.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-cry.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-embarassed.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-frown.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-innocent.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-kiss.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-laughing.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-sealed.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-smile.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-surprised.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-undecided.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-wink.gif
	new file:   static/js/tinymce/plugins/emoticons/img/smiley-yell.gif
	new file:   static/js/tinymce/plugins/emoticons/plugin.min.js
	new file:   static/js/tinymce/plugins/example/dialog.html
	new file:   static/js/tinymce/plugins/example/plugin.min.js
	new file:   static/js/tinymce/plugins/example_dependency/plugin.min.js
	new file:   static/js/tinymce/plugins/fullpage/plugin.min.js
	new file:   static/js/tinymce/plugins/fullscreen/plugin.min.js
	new file:   static/js/tinymce/plugins/hr/plugin.min.js
	new file:   static/js/tinymce/plugins/image/plugin.min.js
	new file:   static/js/tinymce/plugins/importcss/plugin.min.js
	new file:   static/js/tinymce/plugins/insertdatetime/plugin.min.js
	new file:   static/js/tinymce/plugins/layer/plugin.min.js
	new file:   static/js/tinymce/plugins/legacyoutput/plugin.min.js
	new file:   static/js/tinymce/plugins/link/plugin.min.js
	new file:   static/js/tinymce/plugins/lists/plugin.min.js
	new file:   static/js/tinymce/plugins/media/moxieplayer.swf
	new file:   static/js/tinymce/plugins/media/plugin.min.js
	new file:   static/js/tinymce/plugins/nonbreaking/plugin.min.js
	new file:   static/js/tinymce/plugins/noneditable/plugin.min.js
	new file:   static/js/tinymce/plugins/pagebreak/plugin.min.js
	new file:   static/js/tinymce/plugins/paste/plugin.min.js
	new file:   static/js/tinymce/plugins/preview/plugin.min.js
	new file:   static/js/tinymce/plugins/print/plugin.min.js
	new file:   static/js/tinymce/plugins/save/plugin.min.js
	new file:   static/js/tinymce/plugins/searchreplace/plugin.min.js
	new file:   static/js/tinymce/plugins/spellchecker/plugin.min.js
	new file:   static/js/tinymce/plugins/tabfocus/plugin.min.js
	new file:   static/js/tinymce/plugins/table/plugin.min.js
	new file:   static/js/tinymce/plugins/template/plugin.min.js
	new file:   static/js/tinymce/plugins/textcolor/plugin.min.js
	new file:   static/js/tinymce/plugins/textpattern/plugin.min.js
	new file:   static/js/tinymce/plugins/visualblocks/css/visualblocks.css
	new file:   static/js/tinymce/plugins/visualblocks/plugin.min.js
	new file:   static/js/tinymce/plugins/visualchars/plugin.min.js
	new file:   static/js/tinymce/plugins/wordcount/plugin.min.js
	new file:   static/js/tinymce/skins/lightgray/content.inline.min.css
	new file:   static/js/tinymce/skins/lightgray/content.min.css
	new file:   static/js/tinymce/skins/lightgray/fonts/tinymce-small.eot
	new file:   static/js/tinymce/skins/lightgray/fonts/tinymce-small.svg
	new file:   static/js/tinymce/skins/lightgray/fonts/tinymce-small.ttf
	new file:   static/js/tinymce/skins/lightgray/fonts/tinymce-small.woff
	new file:   static/js/tinymce/skins/lightgray/fonts/tinymce.eot
	new file:   static/js/tinymce/skins/lightgray/fonts/tinymce.svg
	new file:   static/js/tinymce/skins/lightgray/fonts/tinymce.ttf
	new file:   static/js/tinymce/skins/lightgray/fonts/tinymce.woff
	new file:   static/js/tinymce/skins/lightgray/img/anchor.gif
	new file:   static/js/tinymce/skins/lightgray/img/loader.gif
	new file:   static/js/tinymce/skins/lightgray/img/object.gif
	new file:   static/js/tinymce/skins/lightgray/img/trans.gif
	new file:   static/js/tinymce/skins/lightgray/skin.ie7.min.css
	new file:   static/js/tinymce/skins/lightgray/skin.min.css
	new file:   static/js/tinymce/themes/modern/theme.min.js
	new file:   static/js/tinymce/tinymce.min.js
	new file:   templates/base_site.html
Clear up before publishing code
Merge branch 'master' of https://github.com/JustinWingChungHui/ideapracownia

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/JustinWingChungHui/ideapracownia

Conflicts:
	.gitignore