Merge pull request #1 from MVC-SEC/master

Updating personal fork
Added footer
merging of addFooter branch
Merge pull request #24 from AaronBClark/master

Image Slider (Alpha); Other minor changes

(rebasing can be a real bitch sometimes)
fixed some bugs

about.php and home.php
test

test
Merge pull request #25 from OliverGtz/master

yeah muthafucka
Added footer

responsive footer
matrix bg for slider
minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	display/body/about.php
	display/body/contact.php
	display/body/inc_footer.php
	display/css/main.css
	includes/head.php
Merge pull request #3 from MVC-SEC/master

Updating personal fork