Initial commit
Basics of layout are completed, jqueryui theme is installed
moved navigation down
i have no idea
ok
Merge branch 'master' of https://github.com/Knine-Media/knine

Conflicts:
	.gitignore
	composer.json
	init_autoloader.php
	module/Application/config/module.config.php
	module/Knine/assets/css/fonts.css
	module/Knine/assets/css/knine-theme/images/animated-overlay.gif
	module/Knine/assets/css/knine-theme/images/ui-bg_diagonals-medium_20_cd0a0a_40x40.png
	module/Knine/assets/css/knine-theme/images/ui-bg_diagonals-medium_40_ffef8f_40x40.png
	module/Knine/assets/css/knine-theme/images/ui-bg_diamond-ripple_90_dddddd_22x22.png
	module/Knine/assets/css/knine-theme/images/ui-bg_dots-medium_50_deedf7_4x4.png
	module/Knine/assets/css/knine-theme/images/ui-bg_flat_100_ffffff_40x100.png
	module/Knine/assets/css/knine-theme/images/ui-bg_glass_100_bfecff_1x400.png
	module/Knine/assets/css/knine-theme/images/ui-bg_glass_80_f2fbff_1x400.png
	module/Knine/assets/css/knine-theme/images/ui-bg_highlight-hard_20_000000_1x100.png
	module/Knine/assets/css/knine-theme/images/ui-bg_inset-soft_50_009ee2_1x100.png
	module/Knine/assets/css/knine-theme/images/ui-icons_009ee2_256x240.png
	module/Knine/assets/css/knine-theme/images/ui-icons_2694e8_256x240.png
	module/Knine/assets/css/knine-theme/images/ui-icons_2e83ff_256x240.png
	module/Knine/assets/css/knine-theme/images/ui-icons_72a7cf_256x240.png
	module/Knine/assets/css/knine-theme/images/ui-icons_ffffff_256x240.png
	module/Knine/assets/css/knine-theme/jquery-ui-1.10.3.custom.css
	module/Knine/assets/sass/_base.scss
	module/Knine/assets/sass/layout.scss
	module/Knine/config/module.config.php
	module/Knine/src/Knine/Controller/IndexController.php
	module/Knine/view/knine/index/index.phtml
	module/Knine/view/layout/knine.phtml
	public/index.php
Merge branch 'master' of https://github.com/Knine-Media/knine

Conflicts:
	module/Knine/config/module.config.php
	module/Knine/view/knine/index/index.phtml
Merge branch 'master' of https://github.com/Knine-Media/knine
config and index
b
Merge branch 'master' of https://github.com/Knine-Media/knine