This is Kevin fucking things up
Shitty sun and background
Merge branch 'master' of https://github.com/Rickles/powerhorses-hackathon-01-2013

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Kevin committing to pull?
Merge branch 'master' of https://github.com/Rickles/powerhorses-hackathon-01-2013.git

Conflicts:
	.DS_Store
Kevin committing?
Merge branch 'master' of https://github.com/Rickles/powerhorses-hackathon-01-2013

Conflicts:
	.DS_Store