Made updates to Entity Fiel to be consistant with our Tree
Merge branch 'master' of https://github.com/jcrawley/Spitfire
started declaration statement from Carlos
Merge branch 'master' of https://github.com/jcrawley/Spitfire
Work still in progress.
Merge branch 'teeezyt'
Merge branch 'master' of https://github.com/jcrawley/Spitfire
Changed comment. Testing branching
Merge branch 'teeezyt'
fsdafsad
readded entity
Merge branch 'master' of https://github.com/jcrawley/Spitfire
Figured out branching.
Merge branch 'master' of https://github.com/jcrawley/Spitfire
fixed merges
Merge branch 'master' of https://github.com/jcrawley/Spitfire
Fixing branching.
Merge branch 'teeezyt'
Merge branch 'master' of https://github.com/jcrawley/Spitfire
moved entities folder from spitfire-maybe to spitfire