merging conflicts
completed front end design
merging with front end design

Merge branch 'master' of https://github.com/amithir2/hashr