Initial commit
Merge branch 'master' into gh-pages
CNAME file
sass fixed, some basic templating
homepage design
font awesome, new stuff
Merge branch 'gh-pages' of https://github.com/sinak/shopornot into gh-pages
newest updates
main image stuff
Merge branch 'gh-pages' of http://github.com/sinak/shopornot into gh-pages
added more styler styling
Merge branch 'gh-pages' of https://github.com/sinak/shopornot into gh-pages
buttons added
no idea
Merge branch 'gh-pages' of http://github.com/sinak/shopornot into gh-pages

Conflicts:
	.tmp/styles/hotornot.css
hooked up russell
merge
Add handover folder
add handover dir
all