added clockin functionality
merging of timeclock and master