new file:   .idea/.name
	new file:   .idea/BoreLogger.iml
	new file:   .idea/dictionaries/Clark.xml
	new file:   .idea/encodings.xml
	new file:   .idea/misc.xml
	new file:   .idea/modules.xml
	new file:   .idea/scopes/scope_settings.xml
	new file:   .idea/vcs.xml
	new file:   .idea/workspace.xml
	new file:   html/bore_log_general_info.html
	new file:   images/bison_document-web.png
	new file:   images/bison_logo-web.png
	new file:   images/ic_launcher-web.png
	new file:   images/list-web.png
	new file:   images/share-web.png
	new file:   images/share.png
	new file:   index.html
	new file:   scripts/bison-controller.js
	new file:   scripts/custom-dialog-prompt.js
	new file:   scripts/date.js
	new file:   scripts/jquery.js
	new file:   scripts/jquery.tmpl.js
	new file:   styles/bison.css
	new file:   styles/fonts/AFL.ttf
        new file:   styles/fonts/Godzilla.ttf
	new file:   styles/fonts/Lintsec Regular.ttf
	new file:   styles/fonts/Roboto-Bold.ttf
	new file:   styles/fonts/Roboto-Light.ttf
	new file:   styles/fonts/RockSalt.ttf
	new file:   styles/fonts/Starjhol.ttf
	new file:   styles/fonts/bootle.ttf
	new file:   styles/fonts/darkgard.TTF
	new file:   styles/fonts/dirtydeco.ttf
	new file:   styles/fonts/fanatikaone.ttf
	new file:   styles/fonts/future.ttf
	new file:   styles/fonts/old_town.ttf
	new file:   styles/fonts/rough.ttf
	new file:   styles/fonts/victoria.ttf
Merge branch 'master' of https://github.com/JerTClark/BoreLogger