Merge pull request #1 from cwandrews/gh-pages

pull in real files
added this branch
added this branch
fixed controller file
fixed controller file