initial commit
validate
new themes

Conflicts:
	background/background.html
	background/background.js
	background/background.min.js
	index.html
	manifest.json
	notifications/notifications.js
	notifications/notifications.min.js
	resources/css/button.css
	resources/css/button.min.css
	resources/css/calculator-fonts.css
	resources/css/calculator-fonts.min.css
	resources/css/calculator.css
	resources/css/calculator.min.css
	resources/css/fonts.css
	resources/css/fonts.min.css
	resources/css/reset.css
	resources/css/reset.min.css
	resources/css/style.css
	resources/css/style.min.css
	resources/icons/icon.png
	resources/icons/icon2.png
	resources/icons/x.png
	resources/images/Donate.png
	resources/js/analytics.js
	resources/js/analytics.min.js
	resources/js/calculator-events.js
	resources/js/calculator-events.min.js
	resources/js/calculator-keyboard.js
	resources/js/calculator-keyboard.min.js
	resources/js/calculator.js
	resources/js/calculator.min.js
	resources/js/index.js
	resources/js/index.min.js
	resources/js/libraries/jquery.js
	resources/js/libraries/jquery.min.js
	resources/js/libraries/moment.min.js
	resources/js/libraries/my-library.js
	resources/js/libraries/my-library.min.js
	resources/js/screenshot.js
	resources/js/screenshot.min.js
	resources/js/storage.js
	resources/js/storage.min.js
	resources/js/theme/theme.js
	resources/js/theme/theme.min.js
	resources/plugins/chosen/chosen.min.css
	resources/plugins/dragdealer-master/dragdealer.min.css
	resources/plugins/iCheck-master/skins/square/grey.min.css
	resources/plugins/iCheck-master/skins/square/grey.png
	resources/plugins/iCheck-master/skins/square/grey@2x.png
	resources/plugins/iCheck-master/skins/square/light-grey.sketch/Data

resources/plugins/iCheck-master/skins/square/light-grey.sketch/QuickLook
/Preview.png

resources/plugins/iCheck-master/skins/square/light-grey.sketch/QuickLook
/Thumbnail.png
	resources/plugins/iCheck-master/skins/square/light-grey.sketch/metadata
	resources/plugins/iCheck-master/skins/square/light-grey.sketch/version
	resources/plugins/jquery.qtip.custom/jquery.qtip.min.css
	resources/plugins/jquery.qtip.custom/jquery.qtip.min.js
	resources/plugins/spectrum/spectrum.min.css
	resources/themes/android.json
	resources/themes/default.json
	resources/themes/digital-grey.json
	resources/themes/google.json
	resources/themes/ios.json
	resources/themes/khanacademy.json
	resources/themes/mac.json
	resources/themes/material-design.json
	resources/themes/theme-format.json
	resources/themes/themes-list.json
	screenshot.html
	settings/changelog/changelog.css
	settings/changelog/changelog.html
	settings/changelog/changelog.js
	settings/changelog/changelog.min.css
	settings/changelog/changelog.min.js
	settings/options/options.css
	settings/options/options.html
	settings/options/options.js
	settings/options/options.min.css
	settings/options/options.min.js
	settings/theme-builder/theme-builder.css
	settings/theme-builder/theme-builder.html
	settings/theme-builder/theme-builder.js
	settings/theme-builder/theme-builder.min.css
	settings/theme-builder/theme-builder.min.js
	tutorial/tutorial.css
	tutorial/tutorial.html
	tutorial/tutorial.js
	tutorial/tutorial.min.css
	tutorial/tutorial.min.js
Merge branch 'dev'

Conflicts:
	resources/js/screenshot.js
	resources/js/screenshot.min.js
	resources/js/theme/theme.min.js
2.5.2

ranch 'master' into dev

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.