Modified proof importing to properly set up a problem using a 'Problem: ' line; also no longer imports unicode proofs
Some more fixes to proof importing
Having trouble with merging master
Testing merge
Merge branch 'master' into gh-pages
Update samples
Merge branch 'master' into gh-pages