Merge pull request #2 from MVC-SEC/master

90% version
Merge pull request #29 from FenrirAB/master

Added an effect on 404 page
Merge pull request #5 from MVC-SEC/master

Updating Personal Fork
Merge pull request #30 from FenrirAB/master

bug fixes and banner
Merge branch 'master' of https://github.com/OliverGtz/Website
Added favicon

regular .ico version and a .png at twice the size for apple devices.
Merge pull request #31 from OliverGtz/master

Added favicon
FlexSlider update

Added new slider pugin.
Rebasing
rebasing
rebasing
cleanup

Re-implemented Angelo's 404

Removed erroneous image.
More cleanup

It's late, and I'm finding more things that I overlooked.
Merge pull request #32 from AaronBClark/master

Updated Slider
Merge pull request #3 from MVC-SEC/master

rebase