Map
Merge branch 'master' of https://github.com/woltage/codecamp14-whitetrash

Conflicts:

	styles/.sass-cache/1498f044871bcc64bba5b63bb7a7716ae2cac976/_buttons.scssc
	styles/.sass-cache/f6abc57ab2c6b6e0f40b63ddeadf6b391647fb24/main.scssc