remove merge conflict in trail.rb for image attribute
fix merge again in trail.rb
Merge branch 'master' of https://github.com/nixsticks/HappyFuntimeTrail
add links to trail index and sign up on home index page for 'get started' section
Merge branch 'master' of https://github.com/nixsticks/HappyFuntimeTrail