Merge pull request #3 from MiguelABarbosa/develop

Update Master branch
adding changes to html and urls
modifying urls and models
adding some final touches to basic app
adding some html modifications
miguel's tests
modifying some tests
final night changes
final touches pre group meetup
group meeting commit
Merge pull request #6 from MiguelABarbosa/miguel

Miguel
merge commit
merge conflict resolved