.
Merge branch 'master' of https://github.com/andallas/Blackmodulestudio

Conflicts:
	.gitignore
	.htaccess
	application/config/config.php
	application/views/devlog/create.php
	application/views/pages/about.php
	application/views/pages/contact.php
	application/views/pages/games.php
	application/views/pages/home.php
	application/views/post/create.php
	application/views/projects/katt-media.php
	application/views/projects/katt.php
	application/views/projects/outland.php
	application/views/projects/tones-adventure-media.php
	application/views/projects/tones-adventure.php
	application/views/templates/footer.php
	application/views/templates/header.php
	application/views/templates/nav.php
	assets/css/custom.css
	assets/js/bootstrap-lightbox.js