Merge remote-tracking branch 'upstream/master'
started contact page
merged dev conflicts
Merge remote-tracking branch 'upstream/master'
merged more conflicts
Contact page started
Merge pull request #75 from jschiang/master

For Sethu