modified:   app.py
	new file:   app_old.py
	modified:   tpl/page_chunks/loginBox.tpl
	modified:   app.py
	modified:   app.py
	new file:   img/profiles/martin2.png
	modified:   py/query_parsers/getUser.py
	new file:   py/query_parsers/getUserDB.py
	modified:   tpl/page_chunks/loginBox.tpl
	new file:   tpl/page_chunks/loginBox_old.tpl
Merged martin into master
Merge pull request #68 from rSimulate/martin

Merged martin