setting to merge
Merge branch 'gh-pages'

Conflicts:
	css/partials/_theme.scss
	css/style.css.map
	lib/css/style.css
remove autogenerated CSS
initial commit
merged
Merge pull request #4 from johnsona87/master

I got Images
design file folder added
Thor Design
Merge pull request #5 from thorsveinsson/master

Thor Look & Feel
thor PDF to design files
teams added

everything is linked together too
Merge branch 'master' into gh-pages