added placing of figure and tbale
Merge branch 'master' of https://github.com/sagieske/AA1