style
Moved mockups to mockup folder
Merge branch 'Front-End' into Sierrasstuff