added text
added text to trails
Merge branch 'master' of github.com:dapetcu21/delta-app
Merge branch 'master' of github.com:dapetcu21/delta-app
Fixed unscrollable views in no animation mode
Fixed view controller leakage
Fixed scrolling area in template views
added text to culture and history
Merge branch 'master' of github.com:dapetcu21/delta-app
Master-detail prototype
Removed a console.log
Fixed navigation item double push
Merge branch 'master' of https://github.com/leooob/delta-app
Merge pull request #14 from dapetcu21/master

Work on Master-Detail controllers & bugfixes
Resized pictures
Merge branch 'master' of github.com:dapetcu21/delta-app
added section to planning
added sections to about the delta
Fixed gulp infinite watch loop
Merge pull request #15 from dapetcu21/master

Merged content from Leo