Added prototyping content, fixed some bugs
Merge branch 'master' into Front-End
added prototyping content
Merge branch 'master' into Front-End
Merge branch 'Front-End'