local commit
fixing merge conflicts
Cretaed the error controller and deleted old scirpt and view files
Switched to php5 hash algorithm and fixed bug with friends counter at 0 friends
Merge branch 'develop' of github.com:pateldhruv/inkd into develop