Changes
Fixed conflict
Navigation stuff nasty but it works
Merge branch 'master' of github.com:couchtape/couchtapeapp