realized we should commit more often...
merged with master
Merge pull request #18 from bobolinks-2014/frontend

Frontend