Testing branching
Merge pull request #1 from portlandcodeschool/test

Testing branching
Update README.md
Edited README.md
merging changes from test
Resolved conflict
initial commit for manning branch
sample commit for da peeps
fixing stuff
Added basic assignment
Added basic assignment
Merge branch 'master' into manning
Added intermediate assignment
first commit
semicolon
Added fizzbuzz assignment
Fixed: formatting on README.md
add fizzbuzz.js
Merge pull request #13 from portlandcodeschool/Yates

add fizzbuzz.js
Escaping unescaped characters that should be escaped