Removed macro in lcd display code, wasn't necessary
Merge remote-tracking branch 'origin/lcd' into RFID-scanner
Merged with lcd and added cproj-file