Final migration to AWS (hopefully)
Merge branch 'master' of github.com:roflzok/FG

Conflicts:
	wp-config.php