Merge branch 'master' of mujin.co.jp:www into itakino
add geany project
update for newer versions of bower
fix css
make bussiness hours wider
fix spelling mistake
videos page
links to videos on front page
add social network icons
increase news items on front page
initial scanner stuff
tweaks to scan process
html
heml
Merge branch 'luke-new-product-page' of mujin.co.jp:www
edit scanning html
new img
img
edit html
html