Merge remote-tracking branch 'adambard/master'

Conflicts:
	java.html.markdown

1 files changed, 2 insertions, 2 deletions

diff --git a/coffeescript.html.markdown b/coffeescript.html.markdown
index 4c080bc6..85a5f81f 100644
--- a/coffeescript.html.markdown
+++ b/coffeescript.html.markdown
@@ -6,7 +6,7 @@ contributors:
 filename: coffeescript.coffee
 ---
 
-CoffeeScript is a little language that compiles one-to-one into the equivalent JavaScript, and there is no interpretation at runtime. 
+CoffeeScript is a little language that compiles one-to-one into the equivalent JavaScript, and there is no interpretation at runtime.
 As one of the succeeders of JavaScript, CoffeeScript tries its best to output readable, pretty-printed and smooth-running JavaScript codes working well in every JavaScript runtime.
 
 See also [the CoffeeScript website](http://coffeescript.org/), which has a complete tutorial on CoffeeScript.
@@ -73,7 +73,7 @@ alert "I knew it!" if elvis?
 #=> if(typeof elvis !== "undefined" && elvis !== null) { alert("I knew it!"); }
 
 # Array comprehensions:
-cubes = (math.cube num for num in list) 
+cubes = (math.cube num for num in list)
 #=>cubes = (function() {
 #	var _i, _len, _results;
 #	_results = [];