Screenshot taker every 5 mins
Cherry pick merge conflict on Logger.java
Small fixes for discard pile
Some fixes for note editing and adding
Fix for note taking