ec2 change
pick new change
ec2 changes
Edited locally and on ec2
Merge branch 'master' of https://github.com/ahna/wikiphilia