restoring bootstrap.js after wrong merging mster with origin master
tracking for uncompiled js and less files in gitignore
Merge branch 'master' of https://github.com/SokJang/roux_academy

Conflicts:
	_/js/bootstrap.js