Dont know what Im commiting
Fixed merge
Merge branch 'master' of https://github.com/valentinp/aer1513project
Added swf on less noisy
Fixed merge
Fixed merge