Merge branch 'gh-pages' of github.com:abbott221/WebsiteAndApp into gh-pages

Conflicts:
	README.md
	app/AndroidManifest.xml
	app/res/values/lolSpinner_options.xml
	app/res/values/strings.xml
	app/src/com/MichaelAbbott/myCustomView/Board_View.java
	app/src/com/MichaelAbbott/myViewAsSurface5/Board_MyActivity5.java
	app/src/com/MichaelAbbott/myViewAsSurface5/Board_MyView5.java
	app/src/com/MichaelAbbott/myViewAsSurface6/AI_Hexagon6.java
	app/src/com/MichaelAbbott/myViewAsSurface6/AI_PlayerInteraction6.java
	app/src/com/MichaelAbbott/myViewAsSurface6/Actor.java
	app/src/com/MichaelAbbott/myViewAsSurface6/Actor_BeigeAlien.java
	app/src/com/MichaelAbbott/myViewAsSurface6/Actor_WhitePortal.java
	app/src/com/MichaelAbbott/myViewAsSurface6/Board_Listener6.java
	app/src/com/MichaelAbbott/myViewAsSurface6/Board_Maps6.java
	app/src/com/MichaelAbbott/myViewAsSurface6/Board_Model6.java
	app/src/com/MichaelAbbott/myViewAsSurface6/Board_MyActivity6.java
	app/src/com/MichaelAbbott/myViewAsSurface6/Board_MyView6.java
	app/src/com/MichaelAbbott/myViewAsSurface6/Hexagon6.java
	app/src/com/MichaelAbbott/myViewAsSurface6/View_References6.java
	app/src/com/MichaelAbbott/myViewDeveloperMode/Developer_MyActivityDeveloper.java
	app/src/com/MichaelAbbott/myViewPlayerMode/Player_MyActivityPlayer.java
	app/src/com/MichaelAbbott/myfirstapp/AttemptController1.java
	app/src/com/MichaelAbbott/myfirstapp/AttemptView1.java
	app/src/com/MichaelAbbott/myfirstapp/AttemptView2.java
	app/src/com/MichaelAbbott/myfirstapp/Login_View.java
	app/src/com/MichaelAbbott/myfirstapp/MainActivity.java
	app/src/com/MichaelAbbott/myfirstapp/Post_View.java
	app/src/com/MichaelAbbott/standards/ViewWithActivityBar.java
	pictures_fullsize/Screenshot_2014-05-14-00-21-56.png
	pictures_fullsize/Screenshot_2014-05-14-00-47-20.png