blah
Merge branch 'master' of https://github.com/newenegue/peek_frontend
refactor code
some code refactoring
stuff
merge with eugene's changes
stash
merged
ready for merge
merged with eugene branch