Ummm, I don't actually want to add any of the
changes that I've made, but I'm not sure how
to do that...
Merge branch 'master' of https://github.com/ahrekar/Simplicity
Merge branch 'master' of https://github.com/ahrekar/Simplicity
Merge branch 'master' of https://github.com/ahrekar/Simplicity

Committing the changes to my local commit
that Matt made.

Karl

Conflicts:
	grails-app/views/home/index.gsp~
Merge branch 'master' of https://github.com/ahrekar/Simplicity

Like, I don't even understand why it's asking
me for a merge message...
Made a hack-y fix for the table headers looking like
they are clickable, I just changed the color of these
rows to the color of the row when it is highlighted.
If this fix proves not to be sufficient, I think that
we will have to download the twitterbootstrap files
and modify them so that our behavior is supported.

Karl