Merge pull request #1 from rdbrdd/master

merge
codekit
Merge branch 'gh-pages' of https://github.com/rdbrdd/angular into gh-pages

Conflicts:
	madlib/index.html
Merge branch 'master' into gh-pages

Conflicts:
	madlib/index.html
added reset button
working
Merge branch 'gh-pages'