Fixing merge conflicts
Fixing merge conflicts
Removed stray </div> tag
Merge pull request #12 from gatkin/stack-ex-questions

Stack ex questions