commit to get heroku working
first merge action
second merge action
merging with Paul 26052013
Paul's #9 update
landingpage redesign 101