Merge branch 'master' into Lucas-branch
Merge branch 'chr'
stuff
Merge branch 'master' into Lucas-branch
More changes

More changes
Merge branch 'Lucas-branch'
Merge branch 'master' into chr
Merge branch 'chr'
Merge branch 'master' into Lucas-branch
Add update button and some code

see above
Merge branch 'Lucas-branch'
added button
Merge branch 'master' into chr

Conflicts:
	PostUpNow/index.html