Synch push
Merging stuff.
Merge branch 'master' of https://github.com/valentinp/aer1513project