Here goes nothing
screw you .DS_Store
I've had enough of this
Merge branch 'master' of heroku.com:sketchr
hate
IF IT DOESN'T WORK, I BLOW UP A HOSPITAL
WHY GOD WHY
you make me cry
HGHGGHGHGHGHdkljhafkgjhsdkfjghlsdfiughieru hbgiu
HGHGGHGHGHGHdkljhafkgjhsdkfjghlsdfiughieru hbgiu
HGHGGHGHGHGHdkljhafkgjhsdkfjghlsdfiughieru hbgiu
HGHGGHGHGHGHdkljhafkgjhsdkfjghlsdfiughieru hbgiu
HGHGGHGHGHGHdkljhafkgjhsdkfjghlsdfiughieru hbgiu
HGHGGHGHGHGHdkljhafkgjhsdkfjghlsdfiughieru hbgiu
HGHGGHGHGHGHdkljhafkgjhsdkfjghlsdfiughieru hbgiu
HGHGGHGHGHGHdkljhafkgjhsdkfjghlsdfiughieru hbgiu
chagnes 1 and 2
nada
Merge branch 'master' of https://github.com/sullstecclub/sketchr

Conflicts:
	client/js/home.js