Merge pull request #25 from niwatoribaka/master

blaelkjf;laks
Fixed unforeseen merge issues
working on templates and styling