commit 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	dragonstomp/Library/CurrentLayout.dwlt
Merge branch 'master' of https://github.com/noah-mulfinger/hack2014