fontsize etc
ad 300x250x2 test
ad 336x280x2 test
ad 336x280x2 test
ad 336x280x2 test
Merge branch 'master' into development

Conflicts:
	atom.xml
rousseau rewritten
FXXK YEAHHHHH
Merge pull request #627 from luixxiul/development

Development