Merged in master

alexwolfe · Nov 16, 2014 · a2da735 · a2da735
2 parents 750a2ec + fc86782
commit a2da735
Show file tree

Hide file tree

Showing 5 changed files with 235 additions and 143 deletions.
diff --git a/README.md b/README.md
@@ -100,4 +100,4 @@ Buttons works in all modern browsers (Firefox, Chrome, Safari, IE) and gracefull
 
 
 ## About Buttons
-Buttons is part of the [Unicorn-UI Framework](http://unicorn-ui.com). Created by Alex Wolfe [@alexwolfe](https://twitter.com/alexwolfe) and Rob Levin [@roblevintennis ](https://twitter.com/roblevintennis).
+Buttons is part of the [Unicorn-UI Framework](http://unicorn-ui.com). Created by Alex Wolfe [@alexwolfe](https://twitter.com/alexwolfe) and Rob Levin [@roblevintennis ](https://twitter.com/roblevintennis).
Original file line number	Diff line number	Diff line change
Expand Up		@@ -100,4 +100,4 @@ Buttons works in all modern browsers (Firefox, Chrome, Safari, IE) and gracefull


		## About Buttons
		Buttons is part of the [Unicorn-UI Framework](http://unicorn-ui.com). Created by Alex Wolfe [@alexwolfe](https://twitter.com/alexwolfe) and Rob Levin [@roblevintennis ](https://twitter.com/roblevintennis).
		Buttons is part of the [Unicorn-UI Framework](http://unicorn-ui.com). Created by Alex Wolfe [@alexwolfe](https://twitter.com/alexwolfe) and Rob Levin [@roblevintennis ](https://twitter.com/roblevintennis).