added more tests
Merge branch 'master' of github.com:lowjoel/phortress
fixed merging error in mergeVariables
fixed array format issues
midway through refactoring functionanalyser to use and object instead of an array
Merge branch 'master' of github.com:lowjoel/phortress
Merge branch 'master' of github.com:lowjoel/phortress
done with fix
added implementation for ternary expr in functionanalyser
added currently failing ternary test
Merge branch 'master' of github.com:lowjoel/phortress