external page attribute added
links changed
changes in config.xml, now it does not work, general.css deleted (is never used)
Merge branch 'tiago'
no message
pictures added
background image added
Merge branch 'tiago'
pictures added, lots of changes about the html and css and js in sign in page
no message
Merge branch 'master' of https://github.com/lewiemortier/familyMinute

Conflicts:
	css/sign-in.css
Merge branch 'tiago'