Merge pull request #3 from montricher/master

Readme.md file updated
appended to readme
readme fix
readme fix 2
test
test2
testing again
test3
fixed conflict
fixing merge conflict
Merge branch 'slaffont-master'
test4
Merge pull request #5 from slaffont/master

test 4
 just playing with README
merged changes
Merge branch 'montricher-master'
Added data models and wireframes