Merge branch 'master' of https://github.com/SokJang/roux_academy

Conflicts:
	_/js/myjs.js
Merge branch 'master' of https://github.com/SokJang/roux_academy
added modal function for aside-lastyear.php.
modal photo will be loaded in header.php
myjs.js holds the functions