On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   basics.php
	modified:   index.php
	new file:   js/bootstrap.js
	new file:   js/bootstrap.min.js
	modified:   php/notes.php
	modified:   php/register.php
	modified:   script/decrypt.php
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	new file:   css/bootstrap.css
	new file:   css/bootstrap.min.css
	new file:   css/main.css
	new file:   img/glyphicons-halflings-white.png
	new file:   img/glyphicons-halflings.png
	deleted:    php/.notes.php.swp
Merge https://github.com/FStephenQ/paranoidmessage