Fixed life cycle to less confusing version.
Merge branch 'gh-pages'
Merge branch 'gh-pages'
Resolved index conflict from merge
Updated master with current gh-pages
Updated master
added CC-BY license.
added nano as an option.