front end stuff
fix merge conflicts
Merge pull request #2 from vincenttian/vincent

Vincent