Merge pull request #1 from MVC-SEC/master

Updating fork from MASTER
few more fixes

Basically uploading all changes I made from today... please check for
bugs... also check MAIN.CSS particularly line 27 "height: 30%" i notice
that in the lab that it doesnt show the submit button on both CHROME and
FIREFOX (DID NOT TEST IE) when the height was 195px so 30% seem to fix
the problem... although, it got a bit higher on chrome browser... I will
work on some more but just in case here is the some of the stuff i
worked on.
Merge pull request #27 from FenrirAB/master

few more fixes
Merge pull request #4 from MVC-SEC/master

Updating Personal Fork
New Slider Images; CSS Cleanup

Added newly edited images to the slider.
Deleted redundant CSS rules.
Removed Angelo's Borders (sorry!).
Slider update coming later this week.
Merge pull request #28 from AaronBClark/master

Beautification
Update README.md

Based off of decisions made at the club meeting on 10/10/14.
Merge pull request #2 from MVC-SEC/master

updating my fork
Added an effect on 404 page

Using javascript for the 404 page... for now, i isolated the created
script until I am able to finalized any effect necessary for the 404
page... need assistance on making a perfect responsitivity(sp?)...
otherwise keep the workaround..
Merge pull request #29 from FenrirAB/master

Added an effect on 404 page
bug fixes and banner

header bug fix, footer bug fix, testing slideShow function
Merge pull request #30 from FenrirAB/master

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