blueline edits
Merge branch 'master' of https://github.com/joelbrock/PFC_CORE