typo
changed file references
resolved merge conflict in index.js
addressed merge conflicts
typo
pre merge
stupid merge thing
Merge remote-tracking branch 'origin/webcam' into clientTree
fixed login
basic theme integration on home page - still in dev
fix merge
saving point - do not merge
Getting ready to switch to master
stupid git
Merge branch 'master' into clientTree
sending out for Nathan
merge with logan's branch
saving point - do not merge
Merge branch 'master' of https://github.com/LizaHCarter/misceo
added crawler test and fixed crawler module