Merge branch 'master' of https://github.com/jtirtanata/final-project-ui
Merge branch 'master' of https://github.com/jtirtanata/final-project-ui

Conflicts:
	application/js/myjs.js