Merge pull request #2 from Pinesy/master

added concat css/js files and cssmin/uglify js