Merge branch 'master' into branch/Geoff
Merge branch 'master' into branch/Geoff
doing some math... boolean style
changed it
Merge branches 'branch/nate' and 'master' of github.com:mightyhops/nulam into branch/nate
Cheerio scrapes single hardcoded OEIS page
Makin it all puuurdy
Merge branch 'branch/Geoff' of github.com:mightyhops/nulam into branch/nate
Tweaked comments in app.js
Merge branch 'branch/Geoff' of github.com:mightyhops/nulam into branch/nate

Conflicts:
	views/index.jade

updated less file
updated less file
Merge branch 'branch/nate' into branch/andrewScrape