Merge pull request #1 from MVC-SEC/master

Updating personal fork
Merge pull request #22 from FenrirAB/master

New and Improved Header
Added footer
merging of addFooter branch
Image Slider(alpha); Minor Modifications

Added v0.4 of the image slider.
Changed code in head.php for compatibility.
Bug fix in about.php.
Added images for slider testing.
Image Slider Alpha

Merging conflicts
trying to merge branches after rebase
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
Bug fixes; Transparent Header

Angelo, Oliver, and I fixed image slider and header. Please work on top
of this copy.
Merge pull request #26 from AaronBClark/master

Bug Fixes
Merge pull request #1 from MVC-SEC/master

Updating fork from MASTER