Merge pull request #25 from PurpleKangaroo/master

worked on userData during APCS
changes
Merge pull request #291 from HoltMaki/master

changes