Created placeholder to display in iFrame.
Merge branch 'master' of https://github.com/jtirtanata/final-project-ui

Conflicts:
	css/app.css