Merge remote-tracking branch 'origin/master' into George_v1
Adding website mock up version 3
First fully working version deployed to FIU VM.
First Working Version of code deployed on FIU VM.