Merge branch 'dev2' into dev
Merge branch 'dev'
Merge pull request #6 from jpas/dev

update master
Merge branch 'master' of https://github.com/jpas/characters-sheet
added more markdown support
update to add cdn links manually using htmlrefs
removed bower components from copy
added dist to prepare for gh-pages
Merge pull request #7 from jpas/master

update dev