Test merge from same file
Installing CodeIgniter
Create dummy View templates and View file structure
Update the HTML template with common CSS and JS files
#7 Done
Merge pull request #8 from cucka/master

#7
JS problem
First meeting info
Done
Merge pull request #12 from cucka/master

#8 JS Problem from Cveti
model before languages implemented
templates - scheme only
Admin panel - only create
controls - category & events
Merge branch 'master' of https://github.com/fitil4e/sedmataposoka

Conflicts:
	test_code/server/page.php