commit after reset
working in admin
merging
Merge branch 'friends' of 192.30.252.131:mikedussan/Muneris into friends