Merge pull request #1 from rufy001/master

Front End Design
Merge remote-tracking branch 'upstream/master'