prog
parse stuff
added aviary to flow
had to make change to support 64 bit architecture
merged successfully with master. method was to defer to pbx changes in master and then remove duplicate references in build phases