Merge pull request #2 from themattchan/b_matt

B matt
Update bop.c
Update bop.h
Update bop.c
remove tmp
display text properly
think i fixed the random numbers
dont track editor garbage files
merp
changing tap event notification
removed conflict string
Created gui header file that contains user-defined functions for image creation, deletion, and display
decoupled code
merge resolution
implementing full state machine
Added media resources (commented out)
Removed font from appinfo (don't need it unless we use a custom font)
cleaning code
Edited images to bitmaps
fixed compilation