Added FASM object
Readded some deleted files
Merge branch 'develop'