added my (Jeff's) Project Euler solutions
Merge remote-tracking branch 'origin/patch-1'
??
Merge remote-tracking branch 'upstream/master'
added JS/jQuery mini-project solution by me (RebootJeff)
fixed some weird formatting problem

I don't understand why, but the very end of the document (Additional Resources) was all messed up even though I made sure my fork matched the original repo before editing (original repo does not have the weird formatting problem).
more js codecademy sections
hrs ???
Merge pull request #5 from RebootJeff/master

added link to JS/jQuery mini-project solution by me (RebootJeff)
Merge branch 'master' of https://github.com/phanducsjsu/curriculum into phanducsjsu-master
resolve simple conflict
tweak
add learning_sass.md to /additional_resources/
format edits
Merge remote-tracking branch 'upstream/master'
typo in learning_sass.md
typo fix... again t_t
understanding git resource
add links to web dev 101
spacing