Ignoring the main.swf
Commit before merge
Commit