Merge pull request #13 from tiger-swallowtails-2014/mike

Mike
functional question page