initial commit
fixed merge conflict.
futzing with merge conflict resolution crap....
concluded merge
merge fixes
added materials and isotopics documentation
more material, isotopic documentation
Problem with trying to push last commit
Resolved conflicts - this is tricky with autobuilt files.
fixed merge conflict
merge conflict resolved?
Merge remote-tracking branch 'origin/master' into update_environment_docs
Merge branch 'master' into broken_get_build_links
adds a start to the mat description.
first material draft
adds resource page.
adds a resources page, builds the site.
fixes wrong subheading symbols.
Merge branch 'master' of github.com:katyhuff/cyclus.github.com
Merge branch 'master' of github.com:cyclus/cyclus.github.com