Merge branch 'master', remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:qiime/QiiTa-pet
Update README.md

IMPORTANT since tornado 3.2 needs backports and fails.
Merge remote-tracking branch 'upstream/master'
Combined now moved. Fixes #31
Results page now iframed. Fixes #30
Now checks if name already exists. Fixes #25
fixed triple quotes
reformat finished page
Merge pull request #35 from squirrelo/small_issues

Small issues