Merge pull request #10 from ancagrosan/master

yet another merge
Now that the tag support has slightly improved, users can now aim at a better, more personalised employee feed, with new data like dietary needs, daily bation techniques and statistics, added bonuses and others now more accessible. Also, middle-to-high management will now receive an electric shock when trying to attend the third bathroom in each building
NTCIWBASOMS
Merge pull request #6 from darung/master

This is not a merge