First commit
123
Merge branch 'master' of github.com:Defman21/defmanblog-2-beta

Conflicts:
	.htaccess
	core/index.html
	core/main.class.php
	core/modules/bbcode.module.php
	core/modules/index.html
	core/modules/language.module.php
	index.php
	js/index.html
	redesign.css
	redesign.html
	style.css
123