Merge branch 'master' of github.com:AaronW/coffeescript-cookbook.github.com

Conflicts:
	authors.textile

Author: AaronW

authors.textile

@@ -12,6 +12,7 @@ _The following people are totally rad and awesome because they have contributed
 * Steven Reid _steven @ reidnorthwest . com_
 * David Moulton _dave@themoultons.net_
 * Sebastian Slomski _sebastian@simple-systems.org_
+* Aaron Weinberger _aw9994@cs.ship.edu_
 * ...You! What are you waiting for? Check out the <a href="/contributing">contributing</a> section and get cracking!