Moved flaskr.py to vorlux.py for the app name
Added the images and changed the paths
Github complaining about merge again
Fixed help.html as it was missing content
Fixed links from /images/ to /static/images
Merge branch 'master' of git://github.com/darthlukan/vorlux-flask into darthlukan-master

Conflicts:
	templates/help.html
	vorlux.py
Merge branch 'master' of git://github.com/darthlukan/vorlux-flask into darthlukan-master

Conflicts:
	templates/help.html
Help.html keeps dissappearing...
Took out some things that were added from merge
Merge remote-tracking branch 'upstream/master'